From 8792fb81c7dfa34f743b959f89a3480f5ced40c7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 16 Nov 2007 21:05:15 +0000 Subject: Merged with trunk. The following is autogenerated by git: commit 9aaede75e73be646f35069d0717c8c70004ba3f0 Author: raskin Date: Fri Nov 16 18:37:23 2007 +0000 This was needed for me to get a working gnome-doc-utils package git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865 Author: urkud Date: Fri Nov 16 17:30:34 2007 +0000 gdb upgraded git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit bb908853924046681d1cd6a85b05273aed14fd9f Author: urkud Date: Fri Nov 16 17:29:11 2007 +0000 gphoto2 upgraded to 2.4.0: all-packages.nix git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 619c7004d7140d6016927cd1114fd778aca3ecce Author: MarcWeber Date: Fri Nov 16 17:28:53 2007 +0000 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit f09310ed8403428021d2d751e273fc0add438032 Author: urkud Date: Fri Nov 16 17:28:17 2007 +0000 gphoto2 upgraded to 2.4.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 26d5cc1628e51853fdb9a7d162361b3a13581461 Author: MarcWeber Date: Fri Nov 16 17:27:27 2007 +0000 missing catalog added. Now you can open files git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1 Author: MarcWeber Date: Fri Nov 16 17:09:32 2007 +0000 nix expression creating startup wrapper for jedit git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 69701148e45d29b1712c9f14628459def54be076 Author: MarcWeber Date: Fri Nov 16 17:06:53 2007 +0000 The nice programmers editor jedit is now built on nix as well. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 15ecdd411e78b952d8004323ec871ce6c4969c2e Author: wbreejen Date: Fri Nov 16 14:41:15 2007 +0000 Missing gecko now. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6975eb6f2a972cca2adb2943190a41880e3bedf7 Author: wbreejen Date: Fri Nov 16 14:36:15 2007 +0000 Fix path of libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a Author: wbreejen Date: Fri Nov 16 14:34:02 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7fb35510feb89fecc9d92810a723baead232dff4 Author: wbreejen Date: Fri Nov 16 14:33:36 2007 +0000 added libnotify git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7a9eb1e172ef5b111556d78a30003a87aee7f775 Author: wbreejen Date: Fri Nov 16 14:24:24 2007 +0000 libnotify is missing git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 433cc0578ce00860ddfac7d7934818ec0584f6e1 Author: wbreejen Date: Fri Nov 16 14:08:04 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 194a84b18965e9a3c8f9fa1305fac57690e683cb Author: wbreejen Date: Fri Nov 16 14:07:30 2007 +0000 Added libsexy git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1d832560cf94bfa6793d90ff43f2235415bc3958 Author: wbreejen Date: Fri Nov 16 13:49:02 2007 +0000 Added openftd. Doesnt work (yet) git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee Author: eelco Date: Fri Nov 16 13:08:20 2007 +0000 * GCC 3.4: pass --disable-multilib to make it build on x86_64. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9 Author: raskin Date: Fri Nov 16 03:45:42 2007 +0000 bzip2 dependency added in a couple of places git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 128ac8a7ee8668fc933f4933a66f491c44234379 Author: urkud Date: Thu Nov 15 23:47:03 2007 +0000 Added python to libgsf dependencies git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 1847defee6331b03ba8a54ae9e3e68033310f7a2 Author: eelco Date: Thu Nov 15 17:05:45 2007 +0000 * Use latest Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit cb1992780c20cb5885cf4d3932e7352f8b912533 Author: raskin Date: Thu Nov 15 04:23:46 2007 +0000 Added a currently more functional URL for libgcrypt git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 9d099dbef1a5721065bff5f2edd73844c829f538 Author: urkud Date: Thu Nov 15 00:16:03 2007 +0000 facile: fixed a typo git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 031c5b7d0797f5eee7be0a06856530c29adee710 Author: urkud Date: Thu Nov 15 00:11:56 2007 +0000 Added kde-4 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43 Author: urkud Date: Thu Nov 15 00:08:58 2007 +0000 Added new kde-4 staff git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 18edb608ee7822438d4b2dc2a76af7567efd646a Author: urkud Date: Wed Nov 14 23:48:40 2007 +0000 kde-4: removed old staff from kde-4 dir git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d Author: urkud Date: Wed Nov 14 23:46:48 2007 +0000 lame: upgrade to 3.97 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52f8f699f29b6def41eee392f489c7e8ecd9399d Author: urkud Date: Wed Nov 14 23:44:21 2007 +0000 libgsf: meta written 0.14.7 in my previous commit was a typo: 1.14.7 of course git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62 Author: urkud Date: Wed Nov 14 23:40:39 2007 +0000 libgsf: upgraded to 0.14.7 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 7787b342945cb13856168a353fdc9b0062e5f32b Author: urkud Date: Wed Nov 14 23:37:51 2007 +0000 clucene: upgrade, kde4: remove clucene-core upgraded to 0.9.20 clucene-contrib removed (can't find any version later than 0.9.16a and don't know whether it's compatible with new clucene-core) kde4: old staff removed, will add new tonight git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b4900dece179788dfb8879518b8ec639ba089980 Author: urkud Date: Wed Nov 14 23:25:32 2007 +0000 Strigi removed I'll add a version from kdesupport trunk today git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ffad224993440be069d4f15cf5e73ed018979311 Author: urkud Date: Wed Nov 14 23:23:36 2007 +0000 dbus-glib upgraded to 0.74, meta written git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b Author: urkud Date: Wed Nov 14 23:13:29 2007 +0000 xine-lib: upgraded to 1.1.8 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa Author: urkud Date: Wed Nov 14 23:11:37 2007 +0000 chmlib: upgraded to 0.39 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5 Author: urkud Date: Wed Nov 14 23:05:11 2007 +0000 Added facile library git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f Author: urkud Date: Wed Nov 14 23:03:29 2007 +0000 libgcrypt-1.3.1 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ca314a236b855b73024677f6dc5bc021070c4e72 Author: urkud Date: Wed Nov 14 22:49:24 2007 +0000 Fixed a typo in ocaml-3.10.0 git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit b3fa79d09289ab61a30f63692e7c475d0aec142e Author: urkud Date: Wed Nov 14 22:39:58 2007 +0000 ocaml: Added 3.10.0, using getVersion staff I've added the latest (3.10.0) version of ocaml and let the user choose default version. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 853d65d8a9fd65f7bf918c42342baf6690008f54 Author: urkud Date: Wed Nov 14 22:22:06 2007 +0000 Let user to choose python2.4 or python2.5 Currently, there is some code duplication. I'll try to rewrite it without modifying resulting derivations. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60 Author: urkud Date: Wed Nov 14 21:57:26 2007 +0000 useVersion function added git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba Author: urkud Date: Wed Nov 14 21:41:01 2007 +0000 git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit dd564f36bd54d4900aefa759bc94cfac7496d1a2 Author: MarcWeber Date: Wed Nov 14 19:07:38 2007 +0000 added small script fixing the shebang (#!/bin/...) path. It searches the PATH env variable for the same executable. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 2f9213e49fbaa40634ccb9699e44aec239212aea Author: raskin Date: Wed Nov 14 01:20:17 2007 +0000 Now SVN Nix builds as a purely alternative Nix choice git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 016b6bfcc67244964251d68d86e1fa6de2062e54 Author: raskin Date: Tue Nov 13 15:52:16 2007 +0000 Added possibility to use non-default Nix. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 89f53d7b8dae8d4ec537322340be212602524102 Author: MarcWeber Date: Tue Nov 13 01:26:54 2007 +0000 implemented proposal by niksnut. Now you have to use either date= or tag= when specifying cvs revision git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52 Author: eelco Date: Mon Nov 12 16:45:47 2007 +0000 * Symlink $out/bin to $out/libexec. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit d454ab8861882e18ed3b79287727890ec6668455 Author: raskin Date: Mon Nov 12 16:42:13 2007 +0000 Beta-version of builderDefs fixes. git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 959e395c49753d902201d457cee102b40608d3f9 Author: urkud Date: Mon Nov 12 16:12:50 2007 +0000 djview location corrected git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 52530f607a15017e94225ee50e2698963325ed80 Author: eelco Date: Mon Nov 12 13:51:46 2007 +0000 * Revert the setup hook changes on the trunk (but they remain on the stdenv-updates branch). git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb commit 977bdfec49557f48bc1e121e3375c21d4991434f Author: skolthof Date: Mon Nov 12 13:48:33 2007 +0000 * added Haskell package gtk2hs git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb svn path=/nixpkgs/branches/stdenv-updates/; revision=9727 --- pkgs/development/tools/misc/pkgconfig/builder.sh | 10 ++++++++++ pkgs/development/tools/misc/pkgconfig/default.nix | 12 ++++-------- pkgs/development/tools/misc/pkgconfig/setup-hook.sh | 4 +++- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/tools/misc/pkgconfig/builder.sh (limited to 'pkgs/development/tools/misc/pkgconfig') diff --git a/pkgs/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh new file mode 100644 index 000000000000..6d281da71e4d --- /dev/null +++ b/pkgs/development/tools/misc/pkgconfig/builder.sh @@ -0,0 +1,10 @@ +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 481d2174ebc1..be8c4febe03a 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,18 +1,14 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "pkgconfig-0.22"; + name = "pkgconfig-0.21"; + builder = ./builder.sh; setupHook = ./setup-hook.sh; src = fetchurl { - url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz; - sha256 = "1rpb5wygmp0f8nal7y3ga4556i7hkjdslv3wdq04fj30gns621vy"; + url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz; + md5 = "476f45fab1504aac6697aa7785f0ab91"; }; - postInstall = " - ensureDir \$out/nix-support - cp \$setupHook \$out/nix-support/setup-hook - "; - patches = [ # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738. 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) -- cgit 1.4.1