From 38ec761dcf113361d7bc781e70caadb4e47db322 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 6 May 2012 22:39:39 +0000
Subject: [PATCH] nearly there, please someone check: libvirt/default.nix and
see this post:
http://www.redhat.com/archives/libvir-list/2007-May/msg00064.html
svn path=/nixpkgs/trunk/; revision=33998
---
.../virtualization/virt-manager/default.nix | 20 +++++++------------
.../development/libraries/libvirt/default.nix | 1 +
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index ec510d85f3c6..f0d17b2205e1 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,6 +1,6 @@
x@{builderDefsPackage
- , gnome, gtk, glib, libxml2, libvirt, gtkvnc, cyrus_sasl, libtasn1, wget,curl
- , intltool, python
+ , gnome, gtk, glib, libxml2, libvirt, gtkvnc, cyrus_sasl, libtasn1, makeWrapper
+ , intltool, python, pygtk
, ...}:
builderDefsPackage
(a :
@@ -34,19 +34,13 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = [ "doUnpack" "patchPhase" "doConfigure" "doMakeInstall"];
+ phaseNames = [ "doUnpack" "patchPhase" "doConfigure" "doMakeInstall" "installPhase" ];
- #configureFlags = [
- # --with-libvirt-package-names=libvirt \
- # --with-kvm-packages=qemu-system-x86
+ installPhase = a.fullDepEntry ''
+ wrapProgram $out/bin/virt-manager --set PYTHONPATH $PYTHONPATH
+ '' ["minInit"];
- # --with-libvirt-package-names=libvirt \
- # --with-kvm-packages=qemu-kvm
-
- # --with-libvirt-package-names=%libvirt_packages \
- # --with-kvm-packages=%kvm_packages \
- # "--with-libvirt-package-names=libvirt.py"
- #];
+ #NIX_CFLAGS_COMPILE = "-fno-stack-protector";
meta = {
homepage = http://virt-manager.org;
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index aee034c25daa..de6ef510e16d 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation {
'';
enableParallelBuilding = true;
+ NIX_CFLAGS_COMPILE = "-fno-stack-protector";
meta = {
homepage = http://libvirt.org/;