Author: eelco
Date: Thu Mar 31 13:21:07 2011
New Revision: 26628
URL: https://svn.nixos.org/websvn/nix/?rev=26628&sc=1
Log:
* Some hackery to get Nova to work.
Modified:
nixpkgs/branches/modular-python/pkgs/applications/virtualization/nova/default.nix
Modified:
nixpkgs/branches/modular-python/pkgs/applications/virtualization/nova/default.nix
==============================================================================
---
nixpkgs/branches/modular-python/pkgs/applications/virtualization/nova/default.nix
Thu Mar 31 13:20:49 2011 (r26627)
+++
nixpkgs/branches/modular-python/pkgs/applications/virtualization/nova/default.nix
Thu Mar 31 13:21:07 2011 (r26628)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python }:
+{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl }:
with stdenv.lib;
@@ -35,6 +35,8 @@
# 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 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits