diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-27 23:56:25 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-16 00:21:21 +0000 |
| commit | ee8cfe4bf3319e4eb30ab3be6bf890f615f89453 (patch) | |
| tree | 1a89ee15367a181933a2eed83c0d83f81c697c46 /pkgs/applications/graphics | |
| parent | c71ab32a678a98ce1ec069956bc55d6ea606f55c (diff) | |
| download | nixpkgs-ee8cfe4bf3319e4eb30ab3be6bf890f615f89453.tar nixpkgs-ee8cfe4bf3319e4eb30ab3be6bf890f615f89453.tar.gz nixpkgs-ee8cfe4bf3319e4eb30ab3be6bf890f615f89453.tar.bz2 nixpkgs-ee8cfe4bf3319e4eb30ab3be6bf890f615f89453.tar.lz nixpkgs-ee8cfe4bf3319e4eb30ab3be6bf890f615f89453.tar.xz nixpkgs-ee8cfe4bf3319e4eb30ab3be6bf890f615f89453.tar.zst nixpkgs-ee8cfe4bf3319e4eb30ab3be6bf890f615f89453.zip | |
treewide: pkg-config has `targetPrefix`
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 f2542301119..cbc72f91dcc 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 0ded57b1a72..583a845c3c7 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 |