From 50ae7ab68903c0c2c89ba0b36d16de62ca22e256 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 Mar 2011 13:21:07 +0000 Subject: [PATCH] * Some hackery to get Nova to work. svn path=/nixpkgs/branches/modular-python/; revision=26628 --- pkgs/applications/virtualization/nova/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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