Skip to content

Commit 59ab29f

Browse files
committed
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
1 parent 76a8f48 commit 59ab29f

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

pkgs/applications/virtualization/virtualbox/default.nix

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ let
2323
# guest-additions/default.nix as well.
2424
main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
2525
version = "6.0.14";
26+
27+
iasl' = iasl.overrideAttrs (old: rec {
28+
inherit (old) pname;
29+
version = "20190108";
30+
src = fetchurl {
31+
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
32+
sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q";
33+
};
34+
NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE ++ [ "-Wno-error=stringop-truncation" ];
35+
});
2636
in stdenv.mkDerivation {
2737
pname = "virtualbox";
2838
inherit version;
@@ -41,7 +51,7 @@ in stdenv.mkDerivation {
4151
dontWrapQtApps = true;
4252

4353
buildInputs =
44-
[ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
54+
[ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
4555
libcap glib lvm2 alsaLib curl libvpx pam makeself perl
4656
libXmu libpng libopus python ]
4757
++ optional javaBindings jdk

0 commit comments

Comments
 (0)