diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-29 16:15:08 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-29 16:15:08 +0000 |
commit | 7cec8397c6d78a404b91a877d947d6fbefc23097 (patch) | |
tree | 13e70968c544e19fe903422df729b9fe6c451716 /pkgs/applications/virtualization | |
parent | 353d4508672f05965835f7122b1551f08472776c (diff) |
* Add some more Nova dependencies: anyjson, amqplib, carrot,
sqlalchemy. Updated nose to 1.0.0 to fix "make check" on Python 2.7. svn path=/nixpkgs/branches/modular-python/; revision=26595
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/openstack-compute/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/openstack-compute/default.nix b/pkgs/applications/virtualization/openstack-compute/default.nix index f00e1a3dda0ba..4294ea5ec7f96 100644 --- a/pkgs/applications/virtualization/openstack-compute/default.nix +++ b/pkgs/applications/virtualization/openstack-compute/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, python, setuptools, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: + +with stdenv.lib; let version = "2011.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "openstack-compute-2011.1"; src = fetchurl { @@ -10,10 +12,17 @@ stdenv.mkDerivation { sha256 = "1g8f75mzjpkzhqk91hga5wpjh8d0kbc9fxxjk0px0qjk20qrmb45"; }; - buildInputs = - [ python setuptools pythonPackages.gflags pythonPackages.netaddr pythonPackages.eventlet + pythonPath = + [ pythonPackages.setuptools pythonPackages.eventlet pythonPackages.greenlet + pythonPackages.gflags pythonPackages.netaddr pythonPackages.sqlalchemy + pythonPackages.carrot ]; + buildInputs = + [ pythonPackages.python + pythonPackages.wrapPython + ] ++ pythonPath; + preConfigure = "export HOME=$(pwd)"; buildPhase = "python setup.py build"; @@ -24,6 +33,8 @@ stdenv.mkDerivation { export PYTHONPATH=$p:$PYTHONPATH mkdir -p $p python setup.py install --prefix=$out + + wrapPythonPrograms ''; meta = { |