diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-27 16:36:47 +0200 |
| commit | 98640fd48212f8e6552517f667bba1901f5936d4 (patch) | |
| tree | 0b5f895f31f16b47e8f837c1d3ac87da1f2884eb /pkgs/development/libraries/babl/default.nix | |
| parent | 70c1c856d4c96fb37b6e507db4acb125656f992d (diff) | |
| parent | b40ee8268515d78b419f53fb22a9fad49b985de8 (diff) | |
| download | nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.gz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.bz2 nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.lz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.xz nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.tar.zst nixpkgs-98640fd48212f8e6552517f667bba1901f5936d4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/babl/default.nix')
| -rw-r--r-- | pkgs/development/libraries/babl/default.nix | 36 |
1 files changed, 31 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"; |