public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: pkg-config has targetPrefix

Browse Source
This commit is contained in:
John Ericson
2020-04-27 23:56:25 -04:00
parent c71ab32a67
commit ee8cfe4bf3
12 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/pkgconfig/default.nix
View File

@@ -21,7 +21,7 @@ buildPythonPackage rec {
patches = [ ./executable.patch ];
postPatch = ''
substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/pkg-config"'
substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"'
'';
meta = with lib; {

2
pkgs/development/python-modules/zstd/default.nix
View File

@@ -12,7 +12,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "/usr/bin/pkg-config" "${pkgconfig}/bin/pkg-config"
--replace "/usr/bin/pkg-config" "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
'';
nativeBuildInputs = [ pkgconfig ];