From cb742924249bd60dd7413f8371215f548361ecd1 Mon Sep 17 00:00:00 2001
From: tesnos6921 <7860497+tesnos6921@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:31:38 -0400
Subject: [PATCH 1/2] Update default.nix

---
 pkgs/tools/system/efivar/default.nix | 32 +++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 1fdbba4284b4f..897a7bbcb62cd 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,17 +2,43 @@
 
 stdenv.mkDerivation rec {
   pname = "efivar";
-  version = "39";
+  version = "38";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchFromGitHub {
-    owner = "rhboot";
+    owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    hash = "sha256-s/1k5a3n33iLmSpKQT5u08xoj8ypjf2Vzln88OBrqf0=";
+    hash = "sha256-A38BKGMK3Vo+85wzgxmzTjzZXtpcY9OpbZaONWnMYNk=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/rhboot/efivar/commit/15622b7e5761f3dde3f0e42081380b2b41639a48.patch";
+      sha256 = "sha256-SjZXj0hA2eQu2MfBoNjFPtd2DMYadtL7ZqwjKSf2cmI=";
+    })
+    # src/Makefile: build util.c separately for makeguids
+    # util.c needs to be built twice when cross-compiling
+    (fetchpatch {
+      url = "https://github.com/rhboot/efivar/commit/ca48d3964d26f5e3b38d73655f19b1836b16bd2d.patch";
+      hash = "sha256-DkNFIK4i7Eypyf2UeK7qHW36N2FSVRJ2rnOVLriWi5c=";
+    })
+    (fetchpatch {
+      name = "musl-backport.patch";
+      url = "https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3.patch";
+      sha256 = "7/E0gboU0A45/BY6jGPLuvds6qKtNjzpgKgdNTaVaZQ=";
+    })
+
+    # Fix build against gcc-13: https://github.com/rhboot/efivar/pull/242
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/rhboot/efivar/commit/52fece47d4f3ebd588bd85598bfc7a0142365f7e.patch";
+      hash = "sha256-tOmxbY7kD6kzbBZ2RhQ5gCCpHtu+2gRNa7VUAWdCKu0=";
+    })
+  ];
++  ];
+
   nativeBuildInputs = [ pkg-config mandoc ];
   buildInputs = [ popt ];
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 45fca9e80a768888f303846142fb9cb186602fd7 Mon Sep 17 00:00:00 2001
From: tesnos6921 <7860497+tesnos6921@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:32:45 -0400
Subject: [PATCH 2/2] Update default.nix

---
 pkgs/tools/system/efivar/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 897a7bbcb62cd..9ddb83ca5e363 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
       hash = "sha256-tOmxbY7kD6kzbBZ2RhQ5gCCpHtu+2gRNa7VUAWdCKu0=";
     })
   ];
-+  ];
 
   nativeBuildInputs = [ pkg-config mandoc ];
   buildInputs = [ popt ];