Author: qknight
Date: Sun May  6 22:39:39 2012
New Revision: 33998
URL: https://nixos.org/websvn/nix/?rev=33998&sc=1

Log:
nearly there, please someone check: libvirt/default.nix and see this post: 
http://www.redhat.com/archives/libvir-list/2007-May/msg00064.html

Modified:
   nixpkgs/trunk/pkgs/applications/virtualization/virt-manager/default.nix
   nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix

Modified: 
nixpkgs/trunk/pkgs/applications/virtualization/virt-manager/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/virtualization/virt-manager/default.nix     
Sun May  6 19:25:01 2012        (r33997)
+++ nixpkgs/trunk/pkgs/applications/virtualization/virt-manager/default.nix     
Sun May  6 22:39:39 2012        (r33998)
@@ -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 @@
   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
-
-  #  --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"
-  #];
+  installPhase = a.fullDepEntry ''
+    wrapProgram $out/bin/virt-manager --set PYTHONPATH $PYTHONPATH
+  '' ["minInit"];
+
+  #NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
   meta = {
     homepage = http://virt-manager.org;

Modified: nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix        Sun May 
 6 19:25:01 2012        (r33997)
+++ nixpkgs/trunk/pkgs/development/libraries/libvirt/default.nix        Sun May 
 6 22:39:39 2012        (r33998)
@@ -35,6 +35,7 @@
     '';
 
   enableParallelBuilding = true;
+  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
   meta = {
     homepage = http://libvirt.org/;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to