diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-06-26 14:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-26 14:45:48 +0200 |
| commit | 40bb731ec71bdd7e85ae8c00208d90042e98ce21 (patch) | |
| tree | 9c69fa2ab80d4fd3e8ea6ee0cf435ee9035e234b /pkgs/applications/graphics | |
| parent | 69015ede61fc27b7efa2a2f6241286a0b7e64720 (diff) | |
| parent | 45003ba5f9ca91e9f9c30202bc4865e050586377 (diff) | |
| download | nixpkgs-40bb731ec71bdd7e85ae8c00208d90042e98ce21.tar nixpkgs-40bb731ec71bdd7e85ae8c00208d90042e98ce21.tar.gz nixpkgs-40bb731ec71bdd7e85ae8c00208d90042e98ce21.tar.bz2 nixpkgs-40bb731ec71bdd7e85ae8c00208d90042e98ce21.tar.lz nixpkgs-40bb731ec71bdd7e85ae8c00208d90042e98ce21.tar.xz nixpkgs-40bb731ec71bdd7e85ae8c00208d90042e98ce21.tar.zst nixpkgs-40bb731ec71bdd7e85ae8c00208d90042e98ce21.zip | |
Merge pull request #127151 from NixOS/staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d7840a78bb4..e2fdb19127d 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.0.11-12"; + version = "7.1.0-0"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-vTCfpHcja0z/aplcunUDlg/90EbfrR/xQ9bzdG0n2RY="; + sha256 = "sha256-TmyJMzj5tHMrVm6xRguZmXIg7c6mHmqusMMdJAHNqNg="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 583dcf7c618..13752bfc05d 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8, fixDarwinDylibNames }: +, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }: stdenv.mkDerivation rec { pname = "graphicsmagick"; @@ -27,8 +27,14 @@ stdenv.mkDerivation rec { zlib libtool libwebp ]; - nativeBuildInputs = [ xz ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ xz nukeReferences ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + # Remove CFLAGS from the binaries to avoid closure bloat. + # In the past we have had -dev packages in the closure of the binaries soley due to the string references. + postConfigure = '' + nuke-refs ./magick/magick_config.h + ''; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* |