diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index fb6bd41344ad..a31e1ff3f6a9 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -1,24 +1,27 @@ -{lib, stdenv, fetchurl, fetchpatch, bison, flex}: +{lib, stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { pname = "iasl"; - version = "20200110"; + version = "20210730"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1cb6aa6acrixmdzvj9vv4qs9lmlsbkd27pjlz14i1kq1x3xn0gwx"; + sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a"; }; NIX_CFLAGS_COMPILE = "-O3"; buildFlags = [ "iasl" ]; - buildInputs = [ bison flex ]; + nativeBuildInputs = [ bison flex ]; installPhase = '' - install -d $out/bin - install generate/unix/bin*/iasl $out/bin + runHook preInstall + + install -Dm755 generate/unix/bin*/iasl -t $out/bin + + runHook postInstall ''; meta = { diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 36ad8ff06e38..2d2033aadef3 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20200430"; + version = "20210730"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0z19bniqsa8y0n1qrxmb6gz7m63jpwx22zgk5ablyriixhfpz07v"; + sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a"; }; NIX_CFLAGS_COMPILE = "-O3"; @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { buildFlags = [ "acpibin" "acpidump" + "acpiexamples" "acpiexec" "acpihelp" - "acpinames" + "acpisrc" "acpixtract" ]; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ACPICA Tools"; homepage = "https://www.acpica.org/"; - license = with licenses; [ gpl2 bsd3 ]; + license = with licenses; [ iasl gpl2Only bsd3 ]; platforms = platforms.linux; maintainers = with maintainers; [ tadfisher ]; };