diff options
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/virt-manager/qt.nix | 18 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 8 |
2 files changed, 7 insertions, 19 deletions
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 7e05324a046b..783a424e18c2 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtmultimedia, qtsvg, makeQtWrapper +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, qtbase, qtmultimedia, qtsvg , lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "virt-manager-qt-${version}"; version = "0.43.70.2"; @@ -23,17 +23,9 @@ stdenv.mkDerivation rec { libvirt libvncserver pixman spice_gtk spice_protocol ]; - nativeBuildInputs = [ cmake pkgconfig makeQtWrapper ]; + nativeBuildInputs = [ cmake pkgconfig ]; - postFixup = '' - for f in $out/bin/* ; do - wrapQtProgram $f - done - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { + meta = with lib; { homepage = http://f1ash.github.io/qt-virt-manager; description = "Desktop user interface for managing virtual machines (QT)"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6c49e95b6b94..32e8f9d23f4b 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation { ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr ] - ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ]; + ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; @@ -153,12 +153,8 @@ in stdenv.mkDerivation { find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ -name src -o -exec cp -avt "$libexec" {} + - # Create wrapper script mkdir -p $out/bin - ${optionalString (!headless) '' - makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox - ''} - for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do echo "Linking $file to /bin" test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file |