tjh.dev
edk2: pull upstream brotli fix for gcc-11 (#144137)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
authored by Sergei Trofimovich Sandro and committed by GitHub cda036f1 dae20ac9
+27
-14
pkgs/development/compilers/edk2/default.nix
+27
-14
pkgs/development/compilers/edk2/default.nix
···
1
-
{
2
-
stdenv,
3
-
clangStdenv,
4
-
fetchgit,
5
-
fetchpatch,
6
-
libuuid,
7
-
python3,
8
-
bc,
9
-
clang_9,
10
-
llvmPackages_9,
11
-
overrideCC,
12
-
lib,
13
}:
14
15
let
···
39
version = "202108";
40
41
# submodules
42
-
src = fetchgit {
43
-
url = "https://github.com/tianocore/edk2";
44
rev = "edk2-stable${edk2.version}";
45
sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2";
46
};
47
48
buildInputs = [ libuuid pythonEnv ];
49
···
1
+
{ stdenv
2
+
, clangStdenv
3
+
, fetchFromGitHub
4
+
, fetchpatch
5
+
, libuuid
6
+
, python3
7
+
, bc
8
+
, clang_9
9
+
, llvmPackages_9
10
+
, overrideCC
11
+
, lib
12
}:
13
14
let
···
38
version = "202108";
39
40
# submodules
41
+
src = fetchFromGitHub {
42
+
owner = "tianocore";
43
+
repo = "edk2";
44
rev = "edk2-stable${edk2.version}";
45
+
fetchSubmodules = true;
46
sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2";
47
};
48
+
49
+
patches = [
50
+
# Pull upstream fix for gcc-11 build.
51
+
(fetchpatch {
52
+
name = "gcc-11-vla.patch";
53
+
url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch";
54
+
sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj";
55
+
# Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/"
56
+
stripLen = 1;
57
+
extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/";
58
+
})
59
+
];
60
61
buildInputs = [ libuuid pythonEnv ];
62