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
This commit is contained in:
parent
76a8f48119
commit
59ab29fe88
@ -23,6 +23,16 @@ let
|
|||||||
# guest-additions/default.nix as well.
|
# guest-additions/default.nix as well.
|
||||||
main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
|
main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
|
||||||
version = "6.0.14";
|
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 {
|
in stdenv.mkDerivation {
|
||||||
pname = "virtualbox";
|
pname = "virtualbox";
|
||||||
inherit version;
|
inherit version;
|
||||||
@ -41,7 +51,7 @@ in stdenv.mkDerivation {
|
|||||||
dontWrapQtApps = true;
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
buildInputs =
|
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
|
libcap glib lvm2 alsaLib curl libvpx pam makeself perl
|
||||||
libXmu libpng libopus python ]
|
libXmu libpng libopus python ]
|
||||||
++ optional javaBindings jdk
|
++ optional javaBindings jdk
|
||||||
|
Loading…
Reference in New Issue
Block a user