From 1636f11f12e0a6aac43fb524f5a030e1c421714c Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 20 Apr 2019 22:55:45 +0200 Subject: chipsec: Kernel driver only works on x86_64-linux See: https://github.com/chipsec/chipsec/issues/461 Noticed that when ofBorg failed to build the kernel driver on ARM. --- pkgs/tools/security/chipsec/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index f543479ff18..a32752f8b23 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -7,7 +7,7 @@ python27Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; - rev = if (version == "1.3.7") then version else "v${version}"; + rev = version; sha256 = "00hwhi5f24y429zazhm77l1pp31q7fmx7ks3sfm6d16v89zbcp9a"; }; @@ -35,8 +35,6 @@ python27Packages.buildPythonApplication rec { license = licenses.gpl2; homepage = https://github.com/chipsec/chipsec; maintainers = with maintainers; [ johnazoidberg ]; - # This package description is currently only able to build the Linux driver. - # But the other functionality should work on all platforms. - platforms = platforms.all; + platforms = if withDriver then [ "x86_64-linux" ] else platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a650a249f1..15ca1f810f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -684,8 +684,10 @@ in chezmoi = callPackage ../tools/misc/chezmoi { }; - # Without kernel driver, should build and work on non-linux as well - chipsec = callPackage ../tools/security/chipsec { }; + chipsec = callPackage ../tools/security/chipsec { + kernel = null; + withDriver = false; + }; clair = callPackage ../tools/admin/clair { }; -- cgit 1.4.1