diff options
| author | Robert Schütz <nix@dotlambda.de> | 2024-02-28 16:49:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-28 16:49:00 +0000 |
| commit | ec7958d40b061266f13bedba5216e6c3c5004283 (patch) | |
| tree | 2112d8c2b57e6c26cac9f34119136229a2a7cae1 /pkgs/applications/graphics | |
| parent | 074a096a379e815dcb7b6d3c6e201336944ab318 (diff) | |
| parent | abc8ebc206f00f15e09c17243a22fed2d12cefd4 (diff) | |
| download | nixlib-ec7958d40b061266f13bedba5216e6c3c5004283.tar nixlib-ec7958d40b061266f13bedba5216e6c3c5004283.tar.gz nixlib-ec7958d40b061266f13bedba5216e6c3c5004283.tar.bz2 nixlib-ec7958d40b061266f13bedba5216e6c3c5004283.tar.lz nixlib-ec7958d40b061266f13bedba5216e6c3c5004283.tar.xz nixlib-ec7958d40b061266f13bedba5216e6c3c5004283.tar.zst nixlib-ec7958d40b061266f13bedba5216e6c3c5004283.zip | |
Merge pull request #291942 from uninsane/pr-imagemagick-cross
imagemagick, graphicsmagick: remove build coreutils from cross-compiled output
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}" |