commit d2af4c67228a28b3df3016ca216f48f6d139a62e · pyrox.dev/nixpkgs

+11 -10

pkgs/applications/virtualization/virtualbox/default.nix

···

       1
       1
       -
       { stdenv, buildEnv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext

     

       1
       1
       +
       { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext

     

       2
       2
        
       , libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2

     

       3
       3
        
       , libXrandr, libXinerama

     

       4
       4
        
       , which, alsaLib, curl, libvpx, gawk, nettools, dbus

     
···

       35
       35
        
           '';

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
       -
         vbox-qt5-env = buildEnv {

     

       39
       39
       -
           name = "vbox-qt5-env-${version}";

     

       40
       40
       -
           paths = [ qt5.qtbase.dev qt5.qtbase.out qt5.qtx11extras.dev qt5.qtx11extras.out qt5.qttools.dev ];

     

       41
       41
       -
         };

     

       42
       42
       -
       

     

       43
       38
        
       in stdenv.mkDerivation {

     

       44
       39
        
         name = "virtualbox-${version}";

     

       45
       40
        
       

     
···

       58
       53
        
           ++ optional pythonBindings python

     

       59
       54
        
           ++ optional pulseSupport libpulseaudio

     

       60
       55
        
           ++ optionals (headless) [ libXrandr ]

     

       61
       61
       -
           ++ optionals (!headless) [ vbox-qt5-env libXinerama SDL ];

     

       56
       56
       +
           ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];

     

       62
       57
        
       

     

       63
       58
        
         hardeningDisable = [ "fortify" "pic" "stackprotector" ];

     

       64
       59
        
       

     
···

       66
       61
        
           set -x

     

       67
       62
        
           sed -e 's@MKISOFS --version@MKISOFS -version@' \

     

       68
       63
        
               -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \

     

       69
       69
       -
               -i configure

     

       64
       64
       +
               ${optionalString (!headless) ''

     

       65
       65
       +
               -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \

     

       66
       66
       +
               ''} -i configure

     

       70
       67
        
           ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2

     

       71
       68
        
           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

     

       72
       69
        
           sed -i -e '

     
···

       83
       80
        
         '';

     

       84
       81
        
       

     

       85
       82
        
         patches = optional enableHardening ./hardened.patch

     

       86
       86
       -
           ++ [ ./libressl.patch ];

     

       83
       83
       +
           ++ [ ./libressl.patch ./qtx11extras.patch ];

     

       87
       84
        
       

     

       88
       85
        
         postPatch = ''

     

       89
       86
        
           sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \

     
···

       111
       108
        
           ${optionalString javaBindings ''

     

       112
       109
        
           VBOX_JAVA_HOME                 := ${jdk}

     

       113
       110
        
           ''}

     

       111
       111
       +
           ${optionalString (!headless) ''

     

       112
       112
       +
           PATH_QT5_X11_EXTRAS_LIB        := ${getLib qt5.qtx11extras}/lib

     

       113
       113
       +
           PATH_QT5_X11_EXTRAS_INC        := ${getDev qt5.qtx11extras}/include

     

       114
       114
       +
           TOOL_QT5_LRC                   := ${getDev qt5.qttools}/bin/lrelease

     

       115
       115
       +
           ''}

     

       114
       116
        
           LOCAL_CONFIG

     

       115
       117
        
       

     

       116
       118
        
           ./configure \

     

       117
       119
        
             ${optionalString headless "--build-headless"} \

     

       118
       118
       -
             ${optionalString (!headless) "--with-qt-dir=${vbox-qt5-env}"} \

     

       119
       120
        
             ${optionalString (!javaBindings) "--disable-java"} \

     

       120
       121
        
             ${optionalString (!pythonBindings) "--disable-python"} \

     

       121
       122
        
             ${optionalString (!pulseSupport) "--disable-pulse"} \

+31

pkgs/applications/virtualization/virtualbox/qtx11extras.patch

···

       1
       1
       +
       diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk

     

       2
       2
       +
       index 71b96a3..73391f0 100644

     

       3
       3
       +
       --- a/kBuild/units/qt5.kmk

     

       4
       4
       +
       +++ b/kBuild/units/qt5.kmk

     

       5
       5
       +
       @@ -994,9 +994,10 @@ else

     

       6
       6
       +
           $(eval $(target)_LIBS   += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )

     

       7
       7
       +
          endif

     

       8
       8
       +
         else

     

       9
       9
       +
       -  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )

     

       10
       10
       +
       +  $(eval $(target)_LIBS    += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \

     

       11
       11
       +
       +                              $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL))

     

       12
       12
       +
         endif

     

       13
       13
       +
       - $(eval $(target)_INCS     += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) )

     

       14
       14
       +
       + $(eval $(target)_INCS     += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras )

     

       15
       15
       +
        endif

     

       16
       16
       +
        $(eval $(target)_DEFS      += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )

     

       17
       17
       +
        

     

       18
       18
       +
       diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk

     

       19
       19
       +
       index 38db6b0..7dd446b 100644

     

       20
       20
       +
       --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk

     

       21
       21
       +
       +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk

     

       22
       22
       +
       @@ -912,9 +912,6 @@ VirtualBox_QT_MODULES = Core Gui

     

       23
       23
       +
        ifdef VBOX_WITH_QTGUI_V5

     

       24
       24
       +
         # Qt5 requires additional modules:

     

       25
       25
       +
         VirtualBox_QT_MODULES += Widgets PrintSupport

     

       26
       26
       +
       - VirtualBox_QT_MODULES.linux   += X11Extras

     

       27
       27
       +
       - VirtualBox_QT_MODULES.solaris += X11Extras

     

       28
       28
       +
       - VirtualBox_QT_MODULES.freebsd += X11Extras

     

       29
       29
       +
         VirtualBox_QT_MODULES.darwin  += MacExtras

     

       30
       30
       +
         VirtualBox_QT_MODULES.win     += WinExtras

     

       31
       31
       +
        endif # VBOX_WITH_QTGUI_V5