diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 16:13:48 +0200 |
| commit | a5f5d020c69c22ddc6be48123ef4d30fd262c403 (patch) | |
| tree | bfb79b323b549e1f10a94d0153fdd3761ae893a6 /pkgs/applications/graphics | |
| parent | ed43d951af1030d01e22fe0aaaed568af4e7e8e9 (diff) | |
| parent | bbe71613b6e656e707acdf9c279736c900bf4e87 (diff) | |
| download | nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.gz nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.bz2 nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.lz nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.xz nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.tar.zst nixpkgs-a5f5d020c69c22ddc6be48123ef4d30fd262c403.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index c227416b021..4472e41e9d1 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params for file in "$dev"/bin/*-config; do substituteInPlace "$file" --replace pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 56f88fc4ef7..7a2ae8e4d66 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,9 +85,9 @@ stdenv.mkDerivation { 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/pkg-config + ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do |