Merge branch 'master' into stdenv-updates.

2013-01-11 15:46:10 +01:00
parent 56c7b96844 abd6be85e1
commit b33ad366a1
124 changed files with 1323 additions and 272 deletions
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -37,6 +37,7 @@
      runHook postCheck
    ''

+, preInstall ? ""
 , postInstall ? ""

 , ... } @ attrs:
@@ -63,7 +64,7 @@ python.stdenv.mkDerivation (attrs // {
    ${preConfigure}
  '';

-  installPhase = ''
+  installPhase = preInstall + ''
    mkdir -p "$out/lib/${python.libPrefix}/site-packages"

    echo "installing \`${name}' with \`easy_install'..."