mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-06 04:03:04 +00:00
Merge pull request #282162 from trofi/efivar-gcc-13-tweak
efivar: pull `gcc-13` fix pending upstream inclusion
This commit is contained in:
commit
d10d75abfa
@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
|
||||
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 ];
|
||||
|
@ -7939,7 +7939,7 @@ with pkgs;
|
||||
|
||||
efibootmgr = callPackage ../tools/system/efibootmgr { };
|
||||
|
||||
efivar = disable-warnings-if-gcc13 (callPackage ../tools/system/efivar { });
|
||||
efivar = callPackage ../tools/system/efivar { };
|
||||
|
||||
eget = callPackage ../tools/misc/eget { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user