diff options
| author | nikstur <nikstur@outlook.com> | 2024-05-16 12:15:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 12:15:24 +0200 |
| commit | 3eedfcec6b9474372ceca9356905649ffcd38c49 (patch) | |
| tree | eacce06fc9ba74b347743b8392c0c84e6841716e /pkgs | |
| parent | 4ff362e7100ea0003ec1c7e683f7c6d863fb286b (diff) | |
| parent | dccf5b561897f2987d585eecc33f14a61aae19e3 (diff) | |
Merge pull request #308502 from NixOS/revert-307063-fwupd-efi-1.6
Revert "gnu-efi: 3.0.15 → 3.0.18"
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gnu-efi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd-efi/default.nix | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 3f832ad5d577..171eb5742713 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnu-efi"; - version = "3.0.18"; + version = "3.0.15"; src = fetchurl { url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; - hash = "sha256-fyEslu5mVH7u+1MSZ7ZB5Uc9fYUp8L2Mze/TPPdBP1w="; + hash = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo="; }; buildInputs = [ pciutils ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix index d89c4a7b140a..1c6cc0e57e09 100644 --- a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix @@ -1,8 +1,7 @@ { lib , stdenv , fetchurl -, fetchFromGitHub -, substituteAll +, fetchpatch , pkg-config , meson , ninja @@ -20,6 +19,14 @@ stdenv.mkDerivation rec { hash = "sha256-r9CAWirQgafK/y71vABM46AUe1OAFejsqWY0FxaxJg4="; }; + patches = [ + (fetchpatch { + url = "https://github.com/fwupd/fwupd-efi/commit/26c6ec5c1e7765fb5dc6a4df511ab21ee6c6e67a.patch"; + revert = true; + hash = "sha256-vTdYExd7OlrrZ/LhlEO1zcvpKzeT5OeOeosD8/LUkMg="; + }) + ]; + nativeBuildInputs = [ meson ninja |