diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2019-07-18 13:49:00 +0200 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2019-07-31 13:28:44 +0300 |
| commit | e458a340128834024d3445af5e40fecfbbfea086 (patch) | |
| tree | 748493f7687844d1e96b07ef8c479ffa759b9e1b /pkgs/build-support/build-bazel-package | |
| parent | 019c13616b512d0f8b3bd3e5e17356401a8e4457 (diff) | |
| download | nixpkgs-e458a340128834024d3445af5e40fecfbbfea086.tar nixpkgs-e458a340128834024d3445af5e40fecfbbfea086.tar.gz nixpkgs-e458a340128834024d3445af5e40fecfbbfea086.tar.bz2 nixpkgs-e458a340128834024d3445af5e40fecfbbfea086.tar.lz nixpkgs-e458a340128834024d3445af5e40fecfbbfea086.tar.xz nixpkgs-e458a340128834024d3445af5e40fecfbbfea086.tar.zst nixpkgs-e458a340128834024d3445af5e40fecfbbfea086.zip | |
buildBazelPackage: add flags for build and fetch
They sometimes take separate flags.
Diffstat (limited to 'pkgs/build-support/build-bazel-package')
| -rw-r--r-- | pkgs/build-support/build-bazel-package/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index a308eb8aaa4..32cec42160f 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -4,7 +4,7 @@ , lib }: -args@{ name, bazelFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: +args@{ name, bazelFlags ? [], bazelBuildFlags ? [], bazelFetchFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }: let fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" ]; @@ -12,11 +12,11 @@ let fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ]; in stdenv.mkDerivation (fBuildAttrs // { - inherit name bazelFlags bazelTarget; + inherit name bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget; deps = stdenv.mkDerivation (fFetchAttrs // { name = "${name}-deps"; - inherit bazelFlags bazelTarget; + inherit bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget; nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ]; @@ -49,6 +49,7 @@ in stdenv.mkDerivation (fBuildAttrs // { fetch \ --loading_phase_threads=1 \ $bazelFlags \ + $bazelFetchFlags \ $bazelTarget runHook postBuild @@ -149,6 +150,7 @@ in stdenv.mkDerivation (fBuildAttrs // { "''${host_linkopts[@]}" \ '' + '' $bazelFlags \ + $bazelBuildFlags \ $bazelTarget runHook postBuild |