swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-23 13:45:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #133120 from kidonng/iasl

Browse source
This commit is contained in:
Sandro 2021-08-10 12:38:29 +02:00 committed by GitHub
parent 7e060a572f 0db6011c7f
commit b17e970c38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 30 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/virtualization/OVMF/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, edk2, util-linux, nasm, iasl
{ stdenv, lib, edk2, util-linux, nasm, acpica-tools
, csmSupport ? false, seabios ? null
, secureBoot ? false
, httpSupport ? false
@ -25,7 +25,7 @@ edk2.mkDerivation projectDscPath {
outputs = [ "out" "fd" ];
buildInputs = [ util-linux nasm iasl ];
buildInputs = [ util-linux nasm acpica-tools ];
hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];

5
pkgs/applications/virtualization/seabios/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, iasl, python3 }:
{ lib, stdenv, fetchurl, acpica-tools, python3 }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python3 ];
buildInputs = [ iasl ];
buildInputs = [ acpica-tools ];
strictDeps = true;
@ -47,4 +47,3 @@ stdenv.mkDerivation rec {
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

14
pkgs/applications/virtualization/virtualbox/default.nix
View file

@ -1,4 +1,4 @@
{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook
{ config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
@ -24,16 +24,6 @@ let
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
version = "6.1.26";
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;
@ -52,7 +42,7 @@ in stdenv.mkDerivation {
dontWrapQtApps = true;
buildInputs =
[ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
[ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
libcap glib lvm2 alsa-lib curl libvpx pam makeself perl
libXmu libpng libopus python ]
++ optional javaBindings jdk

4
pkgs/applications/virtualization/xen/generic.nix
View file

@ -3,7 +3,7 @@ config:
# Xen
, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib
, iasl, libaio, libiconv, libuuid, ncurses, openssl, perl
, acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl
, python2Packages
# python2Packages.python
, xz, yajl, zlib
@ -71,7 +71,7 @@ stdenv.mkDerivation (rec {
cmake which
# Xen
bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio
bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio
libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib
# oxenstored

1
pkgs/development/compilers/edk2/default.nix
View file

@ -5,7 +5,6 @@
fetchpatch,
libuuid,
python3,
iasl,
bc,
clang_9,
llvmPackages_9,

33
pkgs/development/compilers/iasl/default.nix
View file

@ -1,33 +0,0 @@
{lib, stdenv, fetchurl, bison, flex}:
stdenv.mkDerivation rec {
pname = "iasl";
version = "20210730";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a";
};
NIX_CFLAGS_COMPILE = "-O3";
buildFlags = [ "iasl" ];
nativeBuildInputs = [ bison flex ];
installPhase =
''
runHook preInstall
install -Dm755 generate/unix/bin*/iasl -t $out/bin
runHook postInstall
'';
meta = {
description = "Intel ACPI Compiler";
homepage = "http://www.acpica.org/";
license = lib.licenses.iasl;
platforms = lib.platforms.unix;
};
}

6
pkgs/os-specific/linux/fwts/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre
, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }:
stdenv.mkDerivation rec {
pname = "fwts";
@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ];
buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ];
postPatch = ''
substituteInPlace src/lib/include/fwts_binpaths.h \
--replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \
--replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \
--replace "/usr/bin/iasl" "${iasl}/bin/iasl"
--replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl"
'';
enableParallelBuilding = true;

22
pkgs/tools/misc/coreboot-utils/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }:
let
version = "4.14";
@ -6,7 +6,7 @@ let
commonMeta = with lib; {
description = "Various coreboot-related tools";
homepage = "https://www.coreboot.org";
license = licenses.gpl2;
license = with licenses; [ gpl2Only gpl2Plus ];
maintainers = with maintainers; [ petabyteboy felixsinger yuka ];
platforms = platforms.linux;
};
@ -81,7 +81,13 @@ let
amdfwtool = generic {
pname = "amdfwtool";
meta.description = "Create AMD firmware combination";
installPhase = "install -Dm755 amdfwtool $out/bin/amdfwtool";
installPhase = ''
runHook preInstall
install -Dm755 amdfwtool $out/bin/amdfwtool
runHook postInstall
'';
};
acpidump-all = generic {
pname = "acpidump-all";
@ -89,9 +95,15 @@ let
meta.description = "Walk through all ACPI tables with their addresses";
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all";
installPhase = ''
runHook preInstall
install -Dm755 acpidump-all $out/bin/acpidump-all
runHook postInstall
'';
postFixup = let
binPath = [ coreutils acpica-tools iasl gnugrep gnused file ];
binPath = [ coreutils acpica-tools gnugrep gnused file ];
in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}";
};
};

1
pkgs/tools/system/acpica-tools/default.nix
View file

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
"acpihelp"
"acpisrc"
"acpixtract"
"iasl"
];
nativeBuildInputs = [ bison flex ];

1
pkgs/top-level/aliases.nix
View file

@ -339,6 +339,7 @@ mapAliases ({
htmlTidy = html-tidy; # added 2014-12-06
hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06
iana_etc = iana-etc; # added 2017-03-08
iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
idea = jetbrains; # added 2017-04-03

2
pkgs/top-level/all-packages.nix
View file

@ -5954,8 +5954,6 @@ with pkgs;
i2pd = callPackage ../tools/networking/i2pd { };
iasl = callPackage ../development/compilers/iasl { };
iannix = libsForQt5.callPackage ../applications/audio/iannix { };
jamulus = libsForQt5.callPackage ../applications/audio/jamulus { };