diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-03-28 00:28:26 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-03-28 00:29:40 +0300 |
| commit | 52451067c7bfe3bd35f26e8387097fd835a26113 (patch) | |
| tree | d3721cca43cabc042a395feeab514a90505ca944 /pkgs/applications/virtualization | |
| parent | 07a76cc934d7628e0a71000226592f23ebe385bc (diff) | |
| download | nixlib-52451067c7bfe3bd35f26e8387097fd835a26113.tar nixlib-52451067c7bfe3bd35f26e8387097fd835a26113.tar.gz nixlib-52451067c7bfe3bd35f26e8387097fd835a26113.tar.bz2 nixlib-52451067c7bfe3bd35f26e8387097fd835a26113.tar.lz nixlib-52451067c7bfe3bd35f26e8387097fd835a26113.tar.xz nixlib-52451067c7bfe3bd35f26e8387097fd835a26113.tar.zst nixlib-52451067c7bfe3bd35f26e8387097fd835a26113.zip | |
virtualbox: wrap with Qt dependencies
Fixes GTK file open dialogs. Also make sure that linked applications really exist, and update their list.
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 257c419d88cf..48000271d12c 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 libXinerama SDL ]; + ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; @@ -153,7 +153,12 @@ in stdenv.mkDerivation { # Create wrapper script mkdir -p $out/bin - for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do + ${optionalString (!headless) '' + makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox + ''} + for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + echo "Linking $file to /bin" + test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file done |