summary refs log tree commit diff
path: root/pkgs/applications/virtualization/nova
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-03-31 13:21:07 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-03-31 13:21:07 +0000
commit50ae7ab68903c0c2c89ba0b36d16de62ca22e256 (patch)
tree6a6625a8d6ee40cfb4ef545f755c6fde55e85740 /pkgs/applications/virtualization/nova
parent2cf4ac9c333065bf30927d0f3960398eaad53e19 (diff)
downloadnixpkgs-50ae7ab68903c0c2c89ba0b36d16de62ca22e256.tar
nixpkgs-50ae7ab68903c0c2c89ba0b36d16de62ca22e256.tar.gz
nixpkgs-50ae7ab68903c0c2c89ba0b36d16de62ca22e256.tar.bz2
nixpkgs-50ae7ab68903c0c2c89ba0b36d16de62ca22e256.tar.lz
nixpkgs-50ae7ab68903c0c2c89ba0b36d16de62ca22e256.tar.xz
nixpkgs-50ae7ab68903c0c2c89ba0b36d16de62ca22e256.tar.zst
nixpkgs-50ae7ab68903c0c2c89ba0b36d16de62ca22e256.zip
* Some hackery to get Nova to work.
svn path=/nixpkgs/branches/modular-python/; revision=26628
Diffstat (limited to 'pkgs/applications/virtualization/nova')
-rw-r--r--pkgs/applications/virtualization/nova/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix
index 79e833ef596..e9407332c90 100644
--- a/pkgs/applications/virtualization/nova/default.nix
+++ b/pkgs/applications/virtualization/nova/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python }:
+{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl }:
 
 with stdenv.lib;
 
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
       # Set the built-in state location to something sensible.
       sed -i nova/flags.py \
         -e "/DEFINE.*'state_path'/ s|../|/var/lib/nova|"
+
+      substituteInPlace nova/virt/images.py --replace /usr/bin/curl ${curl}/bin/curl
     '';
   
   buildPhase = "python setup.py build";
@@ -60,6 +62,10 @@ stdenv.mkDerivation rec {
 
       mkdir -p $out/etc
       cp etc/nova-api.conf $out/etc/
+
+      # Nova makes some weird assumptions about where to find its own
+      # programs relative to the Python directory.
+      ln -sfn $out/bin $out/lib/${pythonPackages.python.libPrefix}/site-packages/bin
     '';
 
   doCheck = false; # !!! fix