Author: chaoflow
Date: Sun Feb 26 17:23:05 2012
New Revision: 32582
URL: https://nixos.org/websvn/nix/?rev=32582&sc=1
Log:
include site for python wrappers to enable deps via pth files
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
Sun Feb 26 17:23:02 2012 (r32581)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix
Sun Feb 26 17:23:05 2012 (r32582)
@@ -3,7 +3,7 @@
(http://pypi.python.org/pypi/setuptools/), which represents a large
number of Python packages nowadays. */
-{ python, setuptools, wrapPython, lib }:
+{ python, setuptools, wrapPython, lib, site }:
{ name, namePrefix ? "python-"
@@ -69,7 +69,8 @@
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
- pythonPath = [ setuptools] ++ pythonPath;
+ # XXX: I think setuptools is not needed here
+ pythonPath = [ setuptools site ] ++ pythonPath;
# XXX: Should we run `easy_install --always-unzip'? It doesn't seem
# to have a noticeable impact on small scripts.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix
Sun Feb 26 17:23:02 2012 (r32581)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix
Sun Feb 26 17:23:05 2012 (r32582)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, wrapPython }:
+{ stdenv, fetchurl, python, wrapPython, site }:
stdenv.mkDerivation rec {
name = "setuptools-0.6c11";
@@ -8,7 +8,7 @@
sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
};
- buildInputs = [ python wrapPython ];
+ buildInputs = [ python wrapPython site ];
buildPhase = "python setup.py build --build-base $out";
@@ -21,7 +21,7 @@
# remove generic files, leave setuptools.pth
rm $dst/site.py*
rm $dst/easy-install.pth
- wrapPythonPrograms
+ pythonPath=${site} wrapPythonPrograms
'';
doCheck = false; # doesn't work with Python 2.7
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Sun Feb
26 17:23:02 2012 (r32581)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Sun Feb
26 17:23:05 2012 (r32582)
@@ -9,13 +9,13 @@
buildPythonPackage = import ../development/python-modules/generic {
inherit (pkgs) lib;
- inherit python wrapPython setuptools;
+ inherit python wrapPython setuptools site;
};
setuptools = import ../development/python-modules/setuptools {
inherit (pkgs) stdenv fetchurl;
- inherit python wrapPython;
+ inherit python wrapPython site;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
