diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
| commit | 02e12559a420f8c544b2facc4931904900a05518 (patch) | |
| tree | ba39d8fa9e874b935d204e74accfed5caaccf0fa /nixpkgs/pkgs/development/libraries/babl | |
| parent | 542f80867c380b0ac79250b6e5358dda8bc49e0d (diff) | |
| parent | 3d085a399c436a41d875801619e8f976b8519196 (diff) | |
| download | nixlib-02e12559a420f8c544b2facc4931904900a05518.tar nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.gz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.bz2 nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.lz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.xz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.zst nixlib-02e12559a420f8c544b2facc4931904900a05518.zip | |
Merge commit '3d085a399c436a41d875801619e8f976b8519196'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/babl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/babl/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/babl/fix-darwin.patch | 16 |
2 files changed, 2 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index c4b1d36ce701..5a579a0505b0 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/babl/fix-darwin.patch b/nixpkgs/pkgs/development/libraries/babl/fix-darwin.patch deleted file mode 100644 index eaeff63689fc..000000000000 --- a/nixpkgs/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 |