summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/virtualization/virtualbox
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-12-30 14:11:32 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2019-12-30 14:11:32 +0100
commit59ab29fe88b06b31de5bea7ac11492a9dbc0c680 (patch)
treec7833e05eb5c6080b160479548735521f639af07 /pkgs/applications/virtualization/virtualbox
parent76a8f48119c92f2be1461c175ea617a28945035e (diff)
virtualbox: fix build
Newer `iasl`-versions disallow strings within certain declarations[1] which breaks the virtualbox build as it relies on exactly this behavior[2]. This should be removed again when updating virtualbox to 6.1. [1] https://acpica.org/node/172 [2] https://hydra.nixos.org/build/108774352
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6ecdf1d29bc1..66d165d09a72 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -23,6 +23,16 @@ let
# guest-additions/default.nix as well.
main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
version = "6.0.14";
+
+ iasl' = iasl.overrideAttrs (old: rec {
+ inherit (old) pname;
+ version = "20190108";
+ src = fetchurl {
+ url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
+ sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q";
+ };
+ NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE ++ [ "-Wno-error=stringop-truncation" ];
+ });
in stdenv.mkDerivation {
pname = "virtualbox";
inherit version;
@@ -41,7 +51,7 @@ in stdenv.mkDerivation {
dontWrapQtApps = true;
buildInputs =
- [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
+ [ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
libcap glib lvm2 alsaLib curl libvpx pam makeself perl
libXmu libpng libopus python ]
++ optional javaBindings jdk