diff options
| author | Will Dietz <w@wdtz.org> | 2018-12-15 18:06:43 -0600 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-12-17 11:33:53 +0100 |
| commit | c761524f30b4ad35b95f0ca32c7c9fe360d32216 (patch) | |
| tree | 7619d5585c70cb4f9387edf02563a9f543472228 /pkgs/tools/system/efibootmgr | |
| parent | cc65a120989a4c6b7e572a8d32fb91dd86ba88e3 (diff) | |
efibootmgr: grab upstream commit as patch to fix w/efivar 37
(removes workaround for previous versions)
Diffstat (limited to 'pkgs/tools/system/efibootmgr')
| -rw-r--r-- | pkgs/tools/system/efibootmgr/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index f23345fb71db1..638b018fd4158 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, efivar, popt }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }: stdenv.mkDerivation rec { name = "efibootmgr-${version}"; @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"; }; + patches = [ + (fetchpatch { + name = "remove-extra-decl.patch"; + url = "https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad.patch"; + sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h"; + }) + ]; + makeFlags = [ "EFIDIR=nixos" ]; installFlags = [ "prefix=$(out)" ]; |