zc.recipe.egg was not imported

nix-community · Mar 6, 2017 · 3529107 · 3529107
1 parent 476b774
commit 3529107
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/pypi2nix/bootstrap.nix b/src/pypi2nix/bootstrap.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, unzip, which, makeWrapper, python }:
+{ stdenv, fetchurl, unzip, which, makeWrapper, python
+}:
 
 let
   deps = import ./deps.nix { inherit fetchurl; };
@@ -31,8 +32,9 @@ in
       PYTHONPATH=$out/base ${python.interpreter} -c "import sys, pip; sys.exit(pip.main(['install', '--force-reinstall', '--upgrade', 'wheel', '--no-index', '--find-links=file://$PWD/../index', '-v', '--target', '$out/extra']))"
       PYTHONPATH=$out/base ${python.interpreter} -c "import sys, pip; sys.exit(pip.main(['install', '--force-reinstall', '--upgrade', 'zc.buildout', 'zc.recipe.egg', 'buildout.requirements', '--no-index', '--find-links=file://$PWD/../index', '-v', '--target', '$out/extra']))"
 
-      touch $out/extra/zc/__init__.py
       touch $out/extra/buildout/__init__.py
+      touch $out/extra/zc/__init__.py
+      touch $out/extra/zc/recipe/__init__.py
 
       echo -e "#!${python.interpreter}\nimport sys, pip; sys.exit(pip.main())" > $out/bin/pip
       echo -e "#!${python.interpreter}\nimport sys, zc.buildout.buildout\nsys.exit(zc.buildout.buildout.main())" > $out/bin/buildout

diff --git a/src/pypi2nix/buildout.nix b/src/pypi2nix/buildout.nix
@@ -29,6 +29,7 @@ in pkgs.stdenv.mkDerivation rec {
     export SSL_CERT_FILE="${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
     export PYTHONPATH=${pypi2nix_bootstrap}/base
     export LANG=en_US.UTF-8
+    export HOME=${project_dir}
 
     mkdir -p ${buildout_cache_dir}/download ${buildout_cache_dir}/eggs