Merge pull request #308502 from NixOS/revert-307063-fwupd-efi-1.6

Revert "gnu-efi: 3.0.15 → 3.0.18"

pkgs/development/libraries/gnu-efi/default.nix

···
 
 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 ];

pkgs/os-specific/linux/firmware/fwupd-efi/default.nix

···
 { lib
 , stdenv
 , fetchurl
-, fetchFromGitHub
-, substituteAll
+, fetchpatch
 , pkg-config
 , meson
 , ninja
···
     url = "https://github.com/fwupd/fwupd-efi/releases/download/${version}/fwupd-efi-${version}.tar.xz";
     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