summary refs log tree commit diff
path: root/pkgs/tools/misc/grub
diff options
context:
space:
mode:
authorThomas Strobel <ts468@cam.ac.uk>2015-12-21 20:20:29 +0100
committerThomas Strobel <ts468@cam.ac.uk>2015-12-22 03:12:30 +0100
commitd856841ba42eb8ad56e71c261753cc5b7f02d6c9 (patch)
treec7da43ca19d44e94f866a80582ec16fd378237eb /pkgs/tools/misc/grub
parentd76c26e876bfea826a1e43bbe8f0243095566216 (diff)
downloadnixpkgs-d856841ba42eb8ad56e71c261753cc5b7f02d6c9.tar
nixpkgs-d856841ba42eb8ad56e71c261753cc5b7f02d6c9.tar.gz
nixpkgs-d856841ba42eb8ad56e71c261753cc5b7f02d6c9.tar.bz2
nixpkgs-d856841ba42eb8ad56e71c261753cc5b7f02d6c9.tar.lz
nixpkgs-d856841ba42eb8ad56e71c261753cc5b7f02d6c9.tar.xz
nixpkgs-d856841ba42eb8ad56e71c261753cc5b7f02d6c9.tar.zst
nixpkgs-d856841ba42eb8ad56e71c261753cc5b7f02d6c9.zip
nixos trustedGRUB: add support for HP laptops
Diffstat (limited to 'pkgs/tools/misc/grub')
-rw-r--r--pkgs/tools/misc/grub/trusted.nix23
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index 87c551db4e3..694f45599f3 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
+, for_HP_laptop ? false
 }:
 
 with stdenv.lib;
@@ -11,7 +12,7 @@ let
 
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "1.2.1";
+  version = if for_HP_laptop then "1.2.1" else "1.2.0";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -25,16 +26,22 @@ let
 
   };
 
-in (
+in
 
 stdenv.mkDerivation rec {
   name = "trustedGRUB2-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/Sirrix-AG/TrustedGRUB2";
-    rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41";
-    sha256 = "4b715837f8632278720d8b29aec06332f5302c6ba78183ced5f48d3c376d89c0";
-  };
+  src = if for_HP_laptop
+        then fetchgit {
+          url = "https://github.com/Sirrix-AG/TrustedGRUB2";
+          rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41";
+          sha256 = "4b715837f8632278720d8b29aec06332f5302c6ba78183ced5f48d3c376d89c0";
+        }
+        else fetchgit {
+          url = "https://github.com/Sirrix-AG/TrustedGRUB2";
+          rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76";
+          sha256 = "8c17bd7e14dd96ae9c4e98723f4e18ec6b21d45ac486ecf771447649829d0b34";
+        };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];
   buildInputs = [ ncurses libusb freetype gettext devicemapper ]
@@ -89,4 +96,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.gnu;
   };
-})
+}