summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Schaefer <git@danielschaefer.me>2019-04-20 22:55:45 +0200
committerDaniel Schaefer <git@danielschaefer.me>2019-04-22 01:32:13 +0200
commit1636f11f12e0a6aac43fb524f5a030e1c421714c (patch)
tree95fb84954792a3df55d95da242497a255eaf07ad
parent18a71fbdd4a216d337a95a1aa397a2596c7c614b (diff)
downloadnixpkgs-1636f11f12e0a6aac43fb524f5a030e1c421714c.tar
nixpkgs-1636f11f12e0a6aac43fb524f5a030e1c421714c.tar.gz
nixpkgs-1636f11f12e0a6aac43fb524f5a030e1c421714c.tar.bz2
nixpkgs-1636f11f12e0a6aac43fb524f5a030e1c421714c.tar.lz
nixpkgs-1636f11f12e0a6aac43fb524f5a030e1c421714c.tar.xz
nixpkgs-1636f11f12e0a6aac43fb524f5a030e1c421714c.tar.zst
nixpkgs-1636f11f12e0a6aac43fb524f5a030e1c421714c.zip
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.
-rw-r--r--pkgs/tools/security/chipsec/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix6
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 { };