Merge branch 'channel-nixos' into python

2013-01-09 22:18:38 +01:00
parent 1b110436bf fdf11fdb7e
commit 06ca1e4768
35 changed files with 407 additions and 67 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:
@@ -61,7 +62,7 @@ python.stdenv.mkDerivation (attrs // {
    ${preConfigure}
  '';

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

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