diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
commit | 7689a348c4eb7ed55bfaa273fadbb036f7f0bde7 (patch) | |
tree | 8ebc0483e7a9f60f47c00f1cc09675cfcf2bc2f1 /pkgs/development/libraries | |
parent | 0f10222e4ecee30837fe7631a37e343ccf82f49f (diff) | |
download | nixpkgs-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar nixpkgs-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.gz nixpkgs-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.bz2 nixpkgs-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.lz nixpkgs-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.xz nixpkgs-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.zst nixpkgs-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.zip |
* Got rid of a lot of "postInstall=postInstall" and similar lines in
builders. These are redundant now. * Inlined some trivial builders. * Removed a few explicit setup-hook creations. This is done automatically now if setupHook is set. * Deleted the initscripts package. NixOS doesn't use it anymore. svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/Xaw3d/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/cracklib/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/db4/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/db4/db4-4.4.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/db4/db4-4.5.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc-2.5/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc-2.7/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/libjpeg/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-3/builder.sh | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 4 |
10 files changed, 15 insertions, 27 deletions
diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh index bbe01704175..afd640b625d 100644 --- a/pkgs/development/libraries/Xaw3d/builder.sh +++ b/pkgs/development/libraries/Xaw3d/builder.sh @@ -1,13 +1,11 @@ source $stdenv/setup -configurePhase=configurePhase configurePhase() { cd lib/Xaw3d (mkdir X11 && cd X11 && ln -fs .. Xaw3d) xmkmf } -buildPhase=buildPhase buildPhase() { make depend $makeFlags make $makeFlags @@ -23,4 +21,4 @@ installPhase() { makeFlags="CDEBUGFLAGS=" # !!! awful hack -genericBuild \ No newline at end of file +genericBuild diff --git a/pkgs/development/libraries/cracklib/builder.sh b/pkgs/development/libraries/cracklib/builder.sh index 0f7473a81b2..3833cc1e6c1 100644 --- a/pkgs/development/libraries/cracklib/builder.sh +++ b/pkgs/development/libraries/cracklib/builder.sh @@ -5,13 +5,9 @@ preConfigure() { cp $dicts cracklib-dicts/ } -preConfigure=preConfigure - postInstall() { $out/sbin/cracklib-format cracklib-dicts/* | $out/sbin/cracklib-packer cracklib_dict cp cracklib_dict.* $out/lib } -postInstall=postInstall - genericBuild diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh index d71bd806743..b9d48b60803 100644 --- a/pkgs/development/libraries/db4/builder.sh +++ b/pkgs/development/libraries/db4/builder.sh @@ -4,11 +4,9 @@ preConfigure() { cd build_unix configureScript=../dist/configure } -preConfigure=preConfigure postInstall() { rm -rf $out/docs } -postInstall=postInstall genericBuild diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix index 4304cd8f9f3..7444439fc73 100644 --- a/pkgs/development/libraries/db4/db4-4.4.nix +++ b/pkgs/development/libraries/db4/db4-4.4.nix @@ -1,8 +1,10 @@ {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "db4-4.4.20"; + builder = ./builder.sh; + src = fetchurl { urls = [ http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz @@ -10,8 +12,11 @@ stdenv.mkDerivation ({ ]; md5 = "afd9243ea353bbaa04421488d3b37900"; }; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") ]; -} // (if stdenv.system == "i686-cygwin" then {patches = [./cygwin-4.4.patch];} else {})) + + patches = [ ./cygwin-4.4.patch ]; +} diff --git a/pkgs/development/libraries/db4/db4-4.5.nix b/pkgs/development/libraries/db4/db4-4.5.nix index c67deaeda45..e5cf6f35a01 100644 --- a/pkgs/development/libraries/db4/db4-4.5.nix +++ b/pkgs/development/libraries/db4/db4-4.5.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation { name = "db4-4.5.20"; + builder = ./builder.sh; + src = fetchurl { url = http://download-east.oracle.com/berkeley-db/db-4.5.20.tar.gz; md5 = "b0f1c777708cb8e9d37fb47e7ed3312d"; }; + configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") ]; + patches = [./cygwin-4.5.patch ./register-race-fix.patch]; } diff --git a/pkgs/development/libraries/glibc-2.5/builder.sh b/pkgs/development/libraries/glibc-2.5/builder.sh index 8d5d6908f04..19ed717de3b 100644 --- a/pkgs/development/libraries/glibc-2.5/builder.sh +++ b/pkgs/development/libraries/glibc-2.5/builder.sh @@ -8,7 +8,6 @@ source $stdenv/setup export PWD_P=$(type -tP pwd) -postUnpack=postUnpack postUnpack() { cd $sourceRoot unpackFile $linuxthreadsSrc @@ -16,7 +15,6 @@ postUnpack() { } -preConfigure=preConfigure preConfigure() { # Use Linuxthreads instead of NPTL. @@ -34,7 +32,6 @@ preConfigure() { } -postConfigure=postConfigure postConfigure() { # Hack: get rid of the `-static' flag set by the bootstrap stdenv. # This has to be done *after* `configure' because it builds some @@ -44,7 +41,6 @@ postConfigure() { } -postInstall=postInstall postInstall() { if test -n "$installLocales"; then make localedata/install-locales diff --git a/pkgs/development/libraries/glibc-2.7/builder.sh b/pkgs/development/libraries/glibc-2.7/builder.sh index 1bf806c0149..d5a43229bfa 100644 --- a/pkgs/development/libraries/glibc-2.7/builder.sh +++ b/pkgs/development/libraries/glibc-2.7/builder.sh @@ -11,7 +11,6 @@ export PWD_P=$(type -tP pwd) export BASH_SHELL=$SHELL -preConfigure=preConfigure preConfigure() { for i in configure io/ftwtest-sh; do @@ -34,7 +33,6 @@ preConfigure() { } -postConfigure=postConfigure postConfigure() { # Hack: get rid of the `-static' flag set by the bootstrap stdenv. # This has to be done *after* `configure' because it builds some @@ -44,7 +42,6 @@ postConfigure() { } -postInstall=postInstall postInstall() { if test -n "$installLocales"; then make localedata/install-locales diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh index b5662f7eb67..923f4f83974 100644 --- a/pkgs/development/libraries/libjpeg/builder.sh +++ b/pkgs/development/libraries/libjpeg/builder.sh @@ -1,6 +1,5 @@ source $stdenv/setup -preConfigure=preConfigure preConfigure() { # Workarounds for the ancient libtool shipped by libjpeg. ln -s $libtool/bin/libtool . @@ -8,7 +7,6 @@ preConfigure() { cp $libtool/share/libtool/config.sub . } -preInstall=preInstall preInstall() { mkdir $out mkdir $out/bin @@ -18,7 +16,6 @@ preInstall() { mkdir $out/man/man1 } -patchPhase=patchPhase patchPhase() { for i in $patches; do patch < $i diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh index b403f036b0e..460ae17766a 100644 --- a/pkgs/development/libraries/qt-3/builder.sh +++ b/pkgs/development/libraries/qt-3/builder.sh @@ -1,10 +1,6 @@ source $stdenv/setup -ensureDir $out/nix-support -substitute "$hook" "$out/nix-support/setup-hook" --subst-var out - -preConfigure=preConfigure preConfigure() { # Patch some of the configure files a bit to get of global paths. @@ -30,7 +26,6 @@ configureScript() { } -postInstall=postInstall postInstall() { # Qt's `make install' is broken; it copies ./bin/qmake, which # is a symlink to ./qmake/qmake. So we end up with a dangling diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index e26c9072076..e1bc3f89741 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation { name = "qt-3.3.8"; builder = ./builder.sh; - hook = ./setup-hook.sh; + + setupHook = ./setup-hook.sh; + src = fetchurl { url = ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8.tar.bz2; sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; |