diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-18 22:22:51 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-18 22:22:51 +0000 |
| commit | 6b9ccbaf78832521cddf38a318551ec0f0033716 (patch) | |
| tree | ba057aca06f25f0f59204a0cfd9b74601ad7c76a /pkgs/development/tools | |
| parent | ba0682330dcca23680c085cf9586227ca3e39cf4 (diff) | |
| download | nixlib-6b9ccbaf78832521cddf38a318551ec0f0033716.tar nixlib-6b9ccbaf78832521cddf38a318551ec0f0033716.tar.gz nixlib-6b9ccbaf78832521cddf38a318551ec0f0033716.tar.bz2 nixlib-6b9ccbaf78832521cddf38a318551ec0f0033716.tar.lz nixlib-6b9ccbaf78832521cddf38a318551ec0f0033716.tar.xz nixlib-6b9ccbaf78832521cddf38a318551ec0f0033716.tar.zst nixlib-6b9ccbaf78832521cddf38a318551ec0f0033716.zip | |
* setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that were only used by the old build farm. * addToSearchPath: removed some parameters that weren't used anywhere. svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
Diffstat (limited to 'pkgs/development/tools')
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/automake/setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/setup-hook.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index c289272d2a78..6adc4420379f 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -1,8 +1,8 @@ addCMakeParams() { - addToSearchPath CMAKE_INCLUDE_PATH /include "" $1 - addToSearchPath CMAKE_LIBRARY_PATH /lib "" $1 - addToSearchPath CMAKE_MODULE_PATH /share/cmake-@majorVersion@/Modules "" $1 + addToSearchPath CMAKE_INCLUDE_PATH $1/include + addToSearchPath CMAKE_LIBRARY_PATH $1/lib + addToSearchPath CMAKE_MODULE_PATH $1/share/cmake-@majorVersion@/Modules } fixCmakeFiles() diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 2b12ae3aee08..156e6ab67128 100644 --- a/pkgs/development/tools/misc/automake/setup-hook.sh +++ b/pkgs/development/tools/misc/automake/setup-hook.sh @@ -1,5 +1,5 @@ addAclocals () { - addToSearchPathWithCustomDelimiter : ACLOCAL_PATH /share/aclocal "" $1 + addToSearchPathWithCustomDelimiter ACLOCAL_PATH $1/share/aclocal } envHooks=(${envHooks[@]} addAclocals) diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index ccb48c129e7c..ea592b36d11e 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -1,6 +1,6 @@ addPkgConfigPath () { - addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1 - addToSearchPath PKG_CONFIG_PATH /share/pkgconfig "" $1 + addToSearchPath PKG_CONFIG_PATH $1/lib/pkgconfig + addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig } envHooks=(${envHooks[@]} addPkgConfigPath) |