diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-12-01 20:05:26 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2007-12-01 20:05:26 +0000 |
| commit | 62676e09ebbc8608ae9fdf295406be9da9511a99 (patch) | |
| tree | f7a4bacc4b24a8d4e22fb8e918d5539ab2201e6f /pkgs/development/tools/misc/pkgconfig | |
| parent | c4640d5f49760a791f91368e7c00fc118826e93b (diff) | |
| download | nixlib-62676e09ebbc8608ae9fdf295406be9da9511a99.tar nixlib-62676e09ebbc8608ae9fdf295406be9da9511a99.tar.gz nixlib-62676e09ebbc8608ae9fdf295406be9da9511a99.tar.bz2 nixlib-62676e09ebbc8608ae9fdf295406be9da9511a99.tar.lz nixlib-62676e09ebbc8608ae9fdf295406be9da9511a99.tar.xz nixlib-62676e09ebbc8608ae9fdf295406be9da9511a99.tar.zst nixlib-62676e09ebbc8608ae9fdf295406be9da9511a99.zip | |
setup-hooks using addToSearchPath
I've accidentially reverted setup-hooks while merging with trunk. Correcting it. svn path=/nixpkgs/branches/stdenv-updates/; revision=9821
Diffstat (limited to 'pkgs/development/tools/misc/pkgconfig')
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/setup-hook.sh | 4 |
3 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh deleted file mode 100644 index 6d281da71e4d..000000000000 --- a/pkgs/development/tools/misc/pkgconfig/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -postInstall() { - test -x $out/nix-support || mkdir $out/nix-support - cp $setupHook $out/nix-support/setup-hook -} -postInstall=postInstall - -genericBuild - diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index be8c4febe03a..41a61f600e04 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "pkgconfig-0.21"; - builder = ./builder.sh; + name = "pkgconfig-0.22"; setupHook = ./setup-hook.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz; - md5 = "476f45fab1504aac6697aa7785f0ab91"; + url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz; + sha256 = "1rpb5wygmp0f8nal7y3ga4556i7hkjdslv3wdq04fj30gns621vy"; }; patches = [ @@ -19,3 +18,4 @@ stdenv.mkDerivation { }) ]; } + diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh index f9e7805ccbf7..f13a44eb9995 100644 --- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh +++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh @@ -1,7 +1,5 @@ addPkgConfigPath () { - if test -d $1/lib/pkgconfig; then - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}$1/lib/pkgconfig" - fi + addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1 } envHooks=(${envHooks[@]} addPkgConfigPath) |