JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57bccb3cb8
nixpkgs/pkgs/applications/virtualization/virtualbox/qtx11extras.patch

32 lines
1.7 KiB
Diff
Raw Normal View History

virtualbox: Explicitly state Qt 5 dependencies In 294281596833b8d83ba90c03b792d31b868f46d7, the dependencies for Qt 5 were passed using buildEnv with all the development binaries, headers and libs. Unfortunately, the build output references that environment which also increases the size of the runtime closure. The upstream makefile assumes a common Qt 5 library path, but that's not the case within Nix, because we have separate paths for the Qt 5 modules. We now patch the makefile to recognize PATH_QT5_X11_EXTRAS_{LIB,INC} so that we can pass in the relevant paths from Qt5X11Extras. In summary, the closure size goes down to 525559600 bytes (501 MB) instead of 863035544 bytes (823 MB) with vbox-qt5-env. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-13 05:01:27 +01:00
diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk
index 71b96a3..73391f0 100644
--- a/kBuild/units/qt5.kmk
+++ b/kBuild/units/qt5.kmk
virtualbox: 5.1.26 -> 5.2.0
2017-11-15 15:03:44 +00:00
@@ -1019,9 +1019,10 @@ else
virtualbox: Explicitly state Qt 5 dependencies In 294281596833b8d83ba90c03b792d31b868f46d7, the dependencies for Qt 5 were passed using buildEnv with all the development binaries, headers and libs. Unfortunately, the build output references that environment which also increases the size of the runtime closure. The upstream makefile assumes a common Qt 5 library path, but that's not the case within Nix, because we have separate paths for the Qt 5 modules. We now patch the makefile to recognize PATH_QT5_X11_EXTRAS_{LIB,INC} so that we can pass in the relevant paths from Qt5X11Extras. In summary, the closure size goes down to 525559600 bytes (501 MB) instead of 863035544 bytes (823 MB) with vbox-qt5-env. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-13 05:01:27 +01:00
$(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
endif
else
- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \
+ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL))
endif
- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) )
+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras )
endif
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
virtualbox: 5.1.26 -> 5.2.0
2017-11-15 15:03:44 +00:00
virtualbox: Explicitly state Qt 5 dependencies In 294281596833b8d83ba90c03b792d31b868f46d7, the dependencies for Qt 5 were passed using buildEnv with all the development binaries, headers and libs. Unfortunately, the build output references that environment which also increases the size of the runtime closure. The upstream makefile assumes a common Qt 5 library path, but that's not the case within Nix, because we have separate paths for the Qt 5 modules. We now patch the makefile to recognize PATH_QT5_X11_EXTRAS_{LIB,INC} so that we can pass in the relevant paths from Qt5X11Extras. In summary, the closure size goes down to 525559600 bytes (501 MB) instead of 863035544 bytes (823 MB) with vbox-qt5-env. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-13 05:01:27 +01:00
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
virtualbox: 5.1.26 -> 5.2.0
2017-11-15 15:03:44 +00:00
index 3295bfefe7..796370623c 100644
virtualbox: Explicitly state Qt 5 dependencies In 294281596833b8d83ba90c03b792d31b868f46d7, the dependencies for Qt 5 were passed using buildEnv with all the development binaries, headers and libs. Unfortunately, the build output references that environment which also increases the size of the runtime closure. The upstream makefile assumes a common Qt 5 library path, but that's not the case within Nix, because we have separate paths for the Qt 5 modules. We now patch the makefile to recognize PATH_QT5_X11_EXTRAS_{LIB,INC} so that we can pass in the relevant paths from Qt5X11Extras. In summary, the closure size goes down to 525559600 bytes (501 MB) instead of 863035544 bytes (823 MB) with vbox-qt5-env. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-13 05:01:27 +01:00
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
virtualbox: 5.1.26 -> 5.2.0
2017-11-15 15:03:44 +00:00
@@ -916,9 +916,6 @@ endif
# The Qt modules we're using.
# (The include directory and lib/framework for each module will be added by the Qt unit.)
VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport
-VirtualBox_QT_MODULES.linux += X11Extras
-VirtualBox_QT_MODULES.solaris += X11Extras
-VirtualBox_QT_MODULES.freebsd += X11Extras
VirtualBox_QT_MODULES.darwin += MacExtras
VirtualBox_QT_MODULES.win += WinExtras
if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
Reference in New Issue Copy Permalink