mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-27 07:37:47 +03:00
Merge pull request #67416 from jtojnar/babl-0.1.72
babl: 0.1.66 → 0.1.72
This commit is contained in:
commit
02bc9e463c
@ -1,15 +1,41 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, gobject-introspection
|
||||
, lcms2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babl";
|
||||
version = "0.1.66";
|
||||
version = "0.1.72";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
|
||||
url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
patches = [
|
||||
# Apple linker does not know --version-script flag
|
||||
# https://gitlab.gnome.org/GNOME/babl/merge_requests/26
|
||||
./fix-darwin.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
lcms2
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Image pixel format conversion library";
|
||||
|
16
pkgs/development/libraries/babl/fix-darwin.patch
Normal file
16
pkgs/development/libraries/babl/fix-darwin.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/babl/meson.build b/babl/meson.build
|
||||
index b551c9a..f452435 100644
|
||||
--- a/babl/meson.build
|
||||
+++ b/babl/meson.build
|
||||
@@ -24,9 +24,9 @@
|
||||
]
|
||||
|
||||
# Linker arguments
|
||||
-babl_link_args = [
|
||||
+babl_link_args = cc.get_supported_link_arguments([
|
||||
'-Wl,--version-script,' + version_script,
|
||||
-]
|
||||
+])
|
||||
if platform_win32
|
||||
babl_link_args += '-Wl,--no-undefined'
|
||||
endif
|
@ -1,38 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
|
||||
, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
|
||||
, libwebp, gnome3, libintl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gegl-0.3.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
|
||||
sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# needs fonts otherwise don't know how to pass them
|
||||
configureFlags = [ "--disable-docs" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
buildInputs = [
|
||||
libpng cairo libjpeg librsvg pango gtk bzip2
|
||||
libraw libwebp gnome3.gexiv2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-3.0.pc
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graph-based image processing framework";
|
||||
homepage = http://www.gegl.org;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -10819,10 +10819,6 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) OpenGL;
|
||||
};
|
||||
|
||||
gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix {
|
||||
gtk = res.gtk2;
|
||||
};
|
||||
|
||||
gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
|
||||
gtk = res.gtk2;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user