diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-11-12 13:51:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-11-12 13:51:46 +0000 |
| commit | 7a424b47f612b1361471974a70bd88d1ca4cfe22 (patch) | |
| tree | 1860daee6b02a7e5da5f143521ccb4d3e0e8308f /pkgs/development/tools/misc/pkgconfig/setup-hook.sh | |
| parent | 93ce7c7a694fa80f41635ead7b335263529cfa38 (diff) | |
| download | nixlib-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar nixlib-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.gz nixlib-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.bz2 nixlib-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.lz nixlib-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.xz nixlib-7a424b47f612b1361471974a70bd88d1ca4cfe22.tar.zst nixlib-7a424b47f612b1361471974a70bd88d1ca4cfe22.zip | |
* Revert the setup hook changes on the trunk (but they remain on the
stdenv-updates branch). svn path=/nixpkgs/trunk/; revision=9652
Diffstat (limited to 'pkgs/development/tools/misc/pkgconfig/setup-hook.sh')
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/setup-hook.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index f13a44eb9995..f9e7805ccbf7 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -1,5 +1,7 @@ addPkgConfigPath () { - addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1 + if test -d $1/lib/pkgconfig; then + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}$1/lib/pkgconfig" + fi } envHooks=(${envHooks[@]} addPkgConfigPath) |