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

Merge pull request #66222 from worldofpeace/fix-virtualbox

Browse Source 
virtualbox: use wrapQtAppsHook
This commit is contained in:
worldofpeace 2019-08-07 07:38:34 -04:00 committed by GitHub
commit 9f82497e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2 { config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , qttools, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus , alsaLib, curl, libvpx, nettools, dbus
, makeself, perl , makeself, perl
, javaBindings ? true, jdk ? null # Almost doesn't affect closure size , javaBindings ? true, jdk ? null # Almost doesn't affect closure size
@ -33,7 +33,11 @@ in stdenv.mkDerivation {
outputs = [ "out" "modsrc" ]; outputs = [ "out" "modsrc" ];
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]; nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]
++ optional (!headless) wrapQtAppsHook;
# Wrap manually because we just need to wrap one executable
dontWrapQtApps = true;
buildInputs = buildInputs =
[ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
@ -43,7 +47,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 libGL ] ++ optionals (headless) [ libXrandr libGL ]
++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ];
hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
@ -53,7 +57,7 @@ in stdenv.mkDerivation {
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
-e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \
${optionalString (!headless) '' ${optionalString (!headless) ''
-e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \ -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \
''} -i configure ''} -i configure
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
@ -105,9 +109,9 @@ in stdenv.mkDerivation {
VBOX_JAVA_HOME := ${jdk} VBOX_JAVA_HOME := ${jdk}
''} ''}
${optionalString (!headless) '' ${optionalString (!headless) ''
PATH_QT5_X11_EXTRAS_LIB := ${getLib qt5.qtx11extras}/lib PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib
PATH_QT5_X11_EXTRAS_INC := ${getDev qt5.qtx11extras}/include PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include
TOOL_QT5_LRC := ${getDev qt5.qttools}/bin/lrelease TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease
''} ''}
LOCAL_CONFIG LOCAL_CONFIG
@ -177,6 +181,10 @@ in stdenv.mkDerivation {
cp -rv out/linux.*/${buildType}/bin/src "$modsrc" cp -rv out/linux.*/${buildType}/bin/src "$modsrc"
''; '';
preFixup = optionalString (!headless) ''
wrapQtApp $out/bin/VirtualBox
'';
passthru = { passthru = {
inherit version; # for guest additions inherit version; # for guest additions
inherit extensionPack; # for inclusion in profile to prevent gc inherit extensionPack; # for inclusion in profile to prevent gc

2
pkgs/top-level/all-packages.nix
View File

@ -20977,7 +20977,7 @@ in
virtscreen = callPackage ../tools/admin/virtscreen {}; virtscreen = callPackage ../tools/admin/virtscreen {};
virtualbox = callPackage ../applications/virtualization/virtualbox { virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
inherit (gnome2) libIDL; inherit (gnome2) libIDL;
}; };