diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index ec510d85f3c..f0d17b2205e 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 aee034c25da..de6ef510e16 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/;