diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-06-03 10:03:07 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-06-03 10:03:07 +0200 |
commit | 9ea7d9a4ce244f36598cbe83270a37c05818a1a4 (patch) | |
tree | d3f7318e05e38b21bc2ff2e4b6d22a80b91d371f /pkgs/development/libraries/gnu-efi | |
parent | 6a837d8fb11efb666589234168461c2d71829e3c (diff) |
Revert Merge #234128: gnu-efi: patch to fix build for riscv64
This reverts commit 4d743b102ab49469214a9570787ff8d373428116, reversing changes made to f48f2c81b7eaba4df6ea1d6eb4494a94854bdc45. After reverting the update in cc3ee6d82b5 this won't apply and it's probably not needed.
Diffstat (limited to 'pkgs/development/libraries/gnu-efi')
-rw-r--r-- | pkgs/development/libraries/gnu-efi/default.nix | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 380905f313365..1bdd6890ab212 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,11 +1,5 @@ -{ lib -, stdenv -, buildPackages -, fetchurl -, fetchpatch -, pciutils -, gitUpdater -}: +{ lib, stdenv, buildPackages, fetchurl, pciutils +, gitUpdater }: stdenv.mkDerivation rec { pname = "gnu-efi"; @@ -16,15 +10,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo="; }; - patches = [ - # riscv64: fix efibind.h missing/duplicate types - # https://sourceforge.net/p/gnu-efi/patches/88 - (fetchpatch { - url = "https://sourceforge.net/p/gnu-efi/patches/88/attachment/riscv64-fix-efibind.h-missing-duplicate-types.patch"; - hash = "sha256-fUAxj1/U9J2A1zMEdnh62+WnVmQ9hrrYwMFppBz1Y1g="; - }) - ]; - buildInputs = [ pciutils ]; hardeningDisable = [ "stackprotector" ]; @@ -45,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/gnu-efi/"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ ]; }; } |