diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:47:04 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-10-25 09:47:04 +0100 |
commit | 2f6b00b15eb91cb690f6d74138ba00b773ffd3d9 (patch) | |
tree | e1e004e468f7dad59163bdccf0a5c760128b8de4 /pkgs/applications/graphics/graphicsmagick | |
parent | 8d6bd565a108cc7bc6d6dc5b6c5758162051ec16 (diff) | |
parent | 4bd836b381c474893747f9051cfac93d94d13786 (diff) | |
download | nixpkgs-2f6b00b15eb91cb690f6d74138ba00b773ffd3d9.tar nixpkgs-2f6b00b15eb91cb690f6d74138ba00b773ffd3d9.tar.gz nixpkgs-2f6b00b15eb91cb690f6d74138ba00b773ffd3d9.tar.bz2 nixpkgs-2f6b00b15eb91cb690f6d74138ba00b773ffd3d9.tar.lz nixpkgs-2f6b00b15eb91cb690f6d74138ba00b773ffd3d9.tar.xz nixpkgs-2f6b00b15eb91cb690f6d74138ba00b773ffd3d9.tar.zst nixpkgs-2f6b00b15eb91cb690f6d74138ba00b773ffd3d9.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/graphics/graphicsmagick')
-rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index b8b21e71c93..b7a1a8c4a6f 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 zlib libtool libwebp - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - nativeBuildInputs = [ xz ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ xz ]; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* |