mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-07 04:34:46 +00:00
Merge pull request #290805 from Elserjo/vbox
virtualbox: add disable update patch
This commit is contained in:
commit
339af2d37a
@ -1,4 +1,4 @@
|
|||||||
{ config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook
|
{ config, stdenv, fetchurl, fetchpatch, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook
|
||||||
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU
|
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU
|
||||||
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras
|
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras
|
||||||
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
|
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
|
||||||
@ -85,7 +85,13 @@ in stdenv.mkDerivation {
|
|||||||
patches =
|
patches =
|
||||||
optional enableHardening ./hardened.patch
|
optional enableHardening ./hardened.patch
|
||||||
# Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1
|
# Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1
|
||||||
++ optional (!headless) ./fix-sdl.patch
|
++ optionals (!headless) [ ./fix-sdl.patch
|
||||||
|
# No update patch disables check for update function
|
||||||
|
# https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/${version}-dfsg-1/debian/patches/16-no-update.patch";
|
||||||
|
hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY=";
|
||||||
|
})]
|
||||||
++ [ ./extra_symbols.patch ]
|
++ [ ./extra_symbols.patch ]
|
||||||
# When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees
|
# When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees
|
||||||
# the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH.
|
# the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH.
|
||||||
|
Loading…
Reference in New Issue
Block a user