public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtualbox: wrap with Qt dependencies 

Fixes GTK file open dialogs. Also make sure that linked applications really
exist, and update their list.
This commit is contained in:
Nikolay Amiantov 2017-03-28 00:28:26 +03:00
parent 07a76cc934
commit 52451067c7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -58,7 +58,7 @@ in stdenv.mkDerivation {
++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optionals (headless) [ libXrandr ] ++ 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" ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@ -153,7 +153,12 @@ in stdenv.mkDerivation {
# Create wrapper script # Create wrapper script
mkdir -p $out/bin 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 ln -s "$libexec/$file" $out/bin/$file
done done