ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 10:07:42 +03:00
Code Issues Projects Releases Wiki Activity

bazel: fix patches after #53988

Browse Source
This commit is contained in:
Orivej Desh 2019-01-15 22:15:22 +00:00
parent 8d35005491
commit 052db93d8f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,9 +53,8 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
patches = [
(lib.optional enableNixHacks ./nix-hacks.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.
@ -148,7 +147,6 @@ stdenv.mkDerivation rec {
--replace '"jvm_opts": JDK9_JVM_OPTS' \
'"jvm_opts": JDK8_JVM_OPTS'
# add nix environment vars to .bazelrc
cat >> .bazelrc <<EOF
build --experimental_distdir=${distDir}