diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-01-22 12:20:37 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-01-22 12:23:42 +0100 |
| commit | 208e761fb056aca3e17db174a013d10c787b70d1 (patch) | |
| tree | 24937527c9384d9819d28d6ebc0e58d1ea1d9da1 /pkgs/development | |
| parent | a65f338ccbd679c1d9f6886d17758d99c80cd938 (diff) | |
| download | nixpkgs-208e761fb056aca3e17db174a013d10c787b70d1.tar nixpkgs-208e761fb056aca3e17db174a013d10c787b70d1.tar.gz nixpkgs-208e761fb056aca3e17db174a013d10c787b70d1.tar.bz2 nixpkgs-208e761fb056aca3e17db174a013d10c787b70d1.tar.lz nixpkgs-208e761fb056aca3e17db174a013d10c787b70d1.tar.xz nixpkgs-208e761fb056aca3e17db174a013d10c787b70d1.tar.zst nixpkgs-208e761fb056aca3e17db174a013d10c787b70d1.zip | |
babl: 0.1.72 → 0.1.74
https://gitlab.gnome.org/GNOME/babl/blob/BABL_0_1_74/NEWS#L6-7
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/babl/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/babl/fix-darwin.patch | 16 |
2 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index c4b1d36ce70..5a579a0505b 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -9,21 +9,15 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.72"; + version = "0.1.74"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hkagjrnza77aasa1kss5hvy37ndm50y6i7hkdn2z8hzgc4i3qb4"; + sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"; }; - patches = [ - # Apple linker does not know --version-script flag - # https://gitlab.gnome.org/GNOME/babl/merge_requests/26 - ./fix-darwin.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/babl/fix-darwin.patch b/pkgs/development/libraries/babl/fix-darwin.patch deleted file mode 100644 index eaeff63689f..00000000000 --- a/pkgs/development/libraries/babl/fix-darwin.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 |