JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #169830 from betaboon/bazel_3-fix-build-with-gcc11

Browse Source 
bazel_3: fix build with gcc11
This commit is contained in:
Artturi 2022-04-23 15:21:20 +03:00 committed by GitHub
commit 7cae5d4df1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/build-managers/bazel/bazel_3/default.nix
View File

@ -186,6 +186,8 @@ stdenv.mkDerivation rec {
# we accept this fact because xcode_locator is only a short-lived process used during the build.
./no-arc.patch
./gcc11.patch
# --experimental_strict_action_env (which may one day become the default
# see bazelbuild/bazel#2574) hardcodes the default
# action environment to a non hermetic value (e.g. "/usr/local/bin").

24
pkgs/development/tools/build-managers/bazel/bazel_3/gcc11.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc
index 6e3a908..030e9ca 100644
--- a/third_party/ijar/mapped_file_unix.cc
+++ b/third_party/ijar/mapped_file_unix.cc
@@ -19,6 +19,7 @@
#include <sys/mman.h>
#include <algorithm>
+#include <limits>
#include "third_party/ijar/mapped_file.h"
diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h
index ed66163..c4b051e 100644
--- a/third_party/ijar/zlib_client.h
+++ b/third_party/ijar/zlib_client.h
@@ -16,6 +16,7 @@
#define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
#include <limits.h>
+#include <limits>
#include "third_party/ijar/common.h"