mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 10:07:42 +03:00
bazel: fix patches after #53988
This commit is contained in:
parent
8d35005491
commit
052db93d8f
@ -53,9 +53,8 @@ stdenv.mkDerivation rec {
|
|||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
(lib.optional enableNixHacks ./nix-hacks.patch)
|
|
||||||
./python-stub-path-fix.patch
|
./python-stub-path-fix.patch
|
||||||
];
|
] ++ lib.optional enableNixHacks ./nix-hacks.patch;
|
||||||
|
|
||||||
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
|
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
|
||||||
|
|
||||||
@ -148,7 +147,6 @@ stdenv.mkDerivation rec {
|
|||||||
--replace '"jvm_opts": JDK9_JVM_OPTS' \
|
--replace '"jvm_opts": JDK9_JVM_OPTS' \
|
||||||
'"jvm_opts": JDK8_JVM_OPTS'
|
'"jvm_opts": JDK8_JVM_OPTS'
|
||||||
|
|
||||||
|
|
||||||
# add nix environment vars to .bazelrc
|
# add nix environment vars to .bazelrc
|
||||||
cat >> .bazelrc <<EOF
|
cat >> .bazelrc <<EOF
|
||||||
build --experimental_distdir=${distDir}
|
build --experimental_distdir=${distDir}
|
||||||
|
Loading…
Reference in New Issue
Block a user