diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-25 01:05:48 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-08-26 14:28:41 +0200 |
| commit | 071804bf6062bbe54c76e3d8d020dc995fe22526 (patch) | |
| tree | f8a1c58b523ad44baf0a5d7c20a7d59dd578b42a /pkgs/development/libraries/babl | |
| parent | 765a71f15025ce78024bae3dc4a92bd2be3a8fbf (diff) | |
| download | nixpkgs-071804bf6062bbe54c76e3d8d020dc995fe22526.tar nixpkgs-071804bf6062bbe54c76e3d8d020dc995fe22526.tar.gz nixpkgs-071804bf6062bbe54c76e3d8d020dc995fe22526.tar.bz2 nixpkgs-071804bf6062bbe54c76e3d8d020dc995fe22526.tar.lz nixpkgs-071804bf6062bbe54c76e3d8d020dc995fe22526.tar.xz nixpkgs-071804bf6062bbe54c76e3d8d020dc995fe22526.tar.zst nixpkgs-071804bf6062bbe54c76e3d8d020dc995fe22526.zip | |
babl: 0.1.66 → 0.1.72
https://gitlab.gnome.org/GNOME/babl/blob/BABL_0_1_72/NEWS#L6-24
Diffstat (limited to 'pkgs/development/libraries/babl')
| -rw-r--r-- | pkgs/development/libraries/babl/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/development/libraries/babl/fix-darwin.patch | 16 |
2 files changed, 47 insertions, 5 deletions
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index eff6ff62632..d95797d5a5f 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -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"; diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch new file mode 100644 index 00000000000..eaeff63689f --- /dev/null +++ b/pkgs/development/libraries/babl/fix-darwin.patch @@ -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 |