diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-21 11:13:27 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-05-21 11:35:46 -0400 |
| commit | 95080ea90ba705f2a17e48b7cd824f2d0d2c44a3 (patch) | |
| tree | d503547778b95ab14e97fd89b2b9b2052152d7cd /pkgs/build-support/pkg-config-wrapper | |
| parent | 23490e3f50bf663971528c2aa2a8b1f496d3d128 (diff) | |
| download | nixpkgs-95080ea90ba705f2a17e48b7cd824f2d0d2c44a3.tar nixpkgs-95080ea90ba705f2a17e48b7cd824f2d0d2c44a3.tar.gz nixpkgs-95080ea90ba705f2a17e48b7cd824f2d0d2c44a3.tar.bz2 nixpkgs-95080ea90ba705f2a17e48b7cd824f2d0d2c44a3.tar.lz nixpkgs-95080ea90ba705f2a17e48b7cd824f2d0d2c44a3.tar.xz nixpkgs-95080ea90ba705f2a17e48b7cd824f2d0d2c44a3.tar.zst nixpkgs-95080ea90ba705f2a17e48b7cd824f2d0d2c44a3.zip | |
pkgconf: Wrap with pkg-config-wrapper
Diffstat (limited to 'pkgs/build-support/pkg-config-wrapper')
| -rw-r--r-- | pkgs/build-support/pkg-config-wrapper/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/build-support/pkg-config-wrapper/setup-hook.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 3e5785d2398..f1bc5da5481 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -4,6 +4,7 @@ { stdenvNoCC , buildPackages , pkg-config +, baseBinName ? "pkg-config" , propagateDoc ? pkg-config != null && pkg-config ? man , extraPackages ? [], extraBuildCommands ? "" }: @@ -34,7 +35,7 @@ stdenv.mkDerivation { shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; - inherit targetPrefix suffixSalt; + inherit targetPrefix suffixSalt baseBinName; outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc"); @@ -63,7 +64,7 @@ stdenv.mkDerivation { echo $pkg-config > $out/nix-support/orig-pkg-config - wrap ${targetPrefix}pkg-config ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/pkg-config" + wrap ${targetPrefix}${baseBinName} ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/${baseBinName}" '' # symlink in share for autoconf to find macros diff --git a/pkgs/build-support/pkg-config-wrapper/setup-hook.sh b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh index 12b9af5e583..34f1a999a82 100644 --- a/pkgs/build-support/pkg-config-wrapper/setup-hook.sh +++ b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh @@ -23,7 +23,7 @@ getTargetRoleWrapper addEnvHooks "$targetOffset" pkgConfigWrapper_addPkgConfigPath -export PKG_CONFIG${role_post}=@targetPrefix@pkg-config +export PKG_CONFIG${role_post}=@targetPrefix@@baseBinName@ # No local scope in sourced file unset -v role_post |