public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Got rid of a lot of "postInstall=postInstall" and similar lines in

Browse Source 
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
This commit is contained in:
Eelco Dolstra
2009-04-23 13:31:10 +00:00
parent 0f10222e4e
commit 7689a348c4
88 changed files with 120 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/interpreters/python/2.4/default.nix
View File

@@ -32,18 +32,18 @@ stdenv.mkDerivation {
configureFlags = "--enable-shared";
preConfigure = "
preConfigure = ''
# Purity.
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
";
'';
setupHook = ./setup-hook.sh;
postInstall = "
ensureDir $out/nix-support
cp ${./setup-hook.sh} $out/nix-support/setup-hook
postInstall = ''
rm -rf $out/lib/python2.4/test
";
'';
passthru = {
inherit zlibSupport;

12
pkgs/development/interpreters/python/2.5/default.nix
View File

@@ -53,20 +53,20 @@ stdenv.mkDerivation {
configureFlags = "--enable-shared --with-wctype-functions";
preConfigure = "
preConfigure = ''
# Purity.
for i in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace $i /no-such-path
done
" + (if readline != null then ''
'' + (if readline != null then ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses"
'' else "");
setupHook = ./setup-hook.sh;
postInstall = "
ensureDir $out/nix-support
cp ${./setup-hook.sh} $out/nix-support/setup-hook
postInstall = ''
rm -rf $out/lib/python2.5/test
";
'';
passthru = {
inherit zlibSupport;