trustedGrub: switch to fetchFromGitHub
This commit is contained in:
parent
6128e1515c
commit
c0e4a932cd
|
@ -1,5 +1,20 @@
|
||||||
{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake
|
{ lib
|
||||||
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, autogen
|
||||||
|
, flex
|
||||||
|
, bison
|
||||||
|
, python2
|
||||||
|
, autoconf
|
||||||
|
, automake
|
||||||
|
, gettext
|
||||||
|
, ncurses
|
||||||
|
, libusb-compat-0_1
|
||||||
|
, freetype
|
||||||
|
, qemu
|
||||||
|
, lvm2
|
||||||
, for_HP_laptop ? false
|
, for_HP_laptop ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -32,17 +47,15 @@ stdenv.mkDerivation rec {
|
||||||
pname = "trustedGRUB2";
|
pname = "trustedGRUB2";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
src = if for_HP_laptop
|
src = fetchFromGitHub {
|
||||||
then fetchgit {
|
owner = "Sirrix-AG";
|
||||||
url = "https://github.com/Sirrix-AG/TrustedGRUB2";
|
repo = "TrustedGRUB2";
|
||||||
rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41";
|
rev = version;
|
||||||
sha256 = "1760d9hsnqkdvlag9nn8f613mqhnsxmidgvdkpmb37b0yi7p6lhz";
|
sha256 =
|
||||||
}
|
if for_HP_laptop
|
||||||
else fetchgit {
|
then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw="
|
||||||
url = "https://github.com/Sirrix-AG/TrustedGRUB2";
|
else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns=";
|
||||||
rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76";
|
};
|
||||||
sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];
|
nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];
|
||||||
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
|
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
|
||||||
|
@ -91,9 +104,10 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
# save target that grub is compiled for
|
# save target that grub is compiled for
|
||||||
grubTarget = if inPCSystems
|
grubTarget =
|
||||||
then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"
|
if inPCSystems
|
||||||
else "";
|
then "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"
|
||||||
|
else "";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
# On -j16 races with early header creation:
|
# On -j16 races with early header creation:
|
||||||
|
|
Loading…
Reference in a new issue