diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-03-08 12:35:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-03-08 12:35:06 +0100 |
| commit | 335c734226b313007c796f8b019884ad488740f0 (patch) | |
| tree | 2e3747650a18253862c71fba7ca829b3c56e163b /pkgs/applications/graphics | |
| parent | 119b065fecc9e770d1bde03f0e042408273264f9 (diff) | |
| parent | e0008b48c915f3973d1785cf7166363680caedfe (diff) | |
| download | nixlib-335c734226b313007c796f8b019884ad488740f0.tar nixlib-335c734226b313007c796f8b019884ad488740f0.tar.gz nixlib-335c734226b313007c796f8b019884ad488740f0.tar.bz2 nixlib-335c734226b313007c796f8b019884ad488740f0.tar.lz nixlib-335c734226b313007c796f8b019884ad488740f0.tar.xz nixlib-335c734226b313007c796f8b019884ad488740f0.tar.zst nixlib-335c734226b313007c796f8b019884ad488740f0.zip | |
Merge #292500: staging-next 2024-03-01
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8fe391173d66..568a8a0ac02e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -25,6 +25,7 @@ , libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp , libheifSupport ? true, libheif , potrace +, coreutils , curl , ApplicationServices , Foundation @@ -64,6 +65,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; configureFlags = [ + # specify delegates explicitly otherwise `convert` will invoke the build + # coreutils for filetypes it doesn't natively support. + "MVDelegate=${lib.getExe' coreutils "mv"}" + "RMDelegate=${lib.getExe' coreutils "rm"}" "--with-frozenpaths" (lib.withFeatureAs (arch != null) "gcc-arch" arch) (lib.withFeature librsvgSupport "rsvg") diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index baae92b14213..893d2cebb601 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences +, coreutils , runCommand , graphicsmagick # for passthru.tests }: @@ -19,6 +20,9 @@ stdenv.mkDerivation rec { ]; configureFlags = [ + # specify delegates explicitly otherwise `gm` will invoke the build + # coreutils for filetypes it doesn't natively support. + "MVDelegate=${lib.getExe' coreutils "mv"}" "--enable-shared" "--with-frozenpaths" "--with-quantum-depth=${toString quantumdepth}" |