colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtualbox: fix build

Browse Source 
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
This commit is contained in:
Maximilian Bosch 2019-12-30 14:11:32 +01:00
parent 76a8f48119
commit 59ab29fe88
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -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