summary refs log tree commit diff
path: root/pkgs/applications/graphics/ImageMagick/default.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-01-19 13:50:04 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-01-19 13:50:04 +0100
commitfc7bd322dfcd204ce6daa95285ff358999ff9a8d (patch)
tree152ad62f3f30148a64a247fc583af45c80cab40c /pkgs/applications/graphics/ImageMagick/default.nix
parent2d91ad963fe799fce74cf52d8d9ea2d4bc963a93 (diff)
parent1d26caa746f7eda613c5e87342889e55b9e5ba96 (diff)
downloadnixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar
nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.gz
nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.bz2
nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.lz
nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.xz
nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.tar.zst
nixpkgs-fc7bd322dfcd204ce6daa95285ff358999ff9a8d.zip
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick/default.nix')
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 42f157e5313..ad559a6f216 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
 , ApplicationServices
@@ -62,7 +62,7 @@ stdenv.mkDerivation {
       [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
     ;
 
-  nativeBuildInputs = [ pkgconfig libtool ];
+  nativeBuildInputs = [ pkg-config libtool ];
 
   buildInputs =
     [ zlib fontconfig freetype ghostscript
@@ -85,10 +85,10 @@ stdenv.mkDerivation {
     moveToOutput "bin/*-config" "$dev"
     moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params
     for file in "$dev"/bin/*-config; do
-      substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \
-        ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config
-      substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \
-        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'"
+      substituteInPlace "$file" --replace "${pkg-config}/bin/pkg-config -config" \
+        ${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config
+      substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \
+        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'"
     done
   '' + lib.optionalString (ghostscript != null) ''
     for la in $out/lib/*.la; do