diff options
Diffstat (limited to 'nix/buildBazelPackageNG')
-rw-r--r-- | nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix | 3 | ||||
-rw-r--r-- | nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix | 4 | ||||
-rw-r--r-- | nix/buildBazelPackageNG/buildBazelPackageNG.nix | 13 |
3 files changed, 14 insertions, 6 deletions
diff --git a/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix b/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix index eb8332e44eef..38edcccaa59c 100644 --- a/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix +++ b/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix @@ -1,6 +1,7 @@ { makeSetupHook }: -makeSetupHook { +makeSetupHook +{ name = "rules_java_bazel_hook"; substitutions = { local_java = ./local_java; diff --git a/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix b/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix index c99cc39e9e4c..21703dea0a82 100644 --- a/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix +++ b/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix @@ -37,7 +37,9 @@ let cp -R . $out ''; }; -in makeSetupHook { +in +makeSetupHook +{ name = "bazelbuild-rules_nodejs-5-hook"; propagatedBuildInputs = [ nodejs diff --git a/nix/buildBazelPackageNG/buildBazelPackageNG.nix b/nix/buildBazelPackageNG/buildBazelPackageNG.nix index 5195d3e89fa8..39c67adea797 100644 --- a/nix/buildBazelPackageNG/buildBazelPackageNG.nix +++ b/nix/buildBazelPackageNG/buildBazelPackageNG.nix @@ -16,12 +16,16 @@ let cleanAttrs = lib.flip removeAttrs [ - "bazelTargets" "depsHash" "extraCacheInstall" "extraBuildSetup" "extraBuildInstall" + "bazelTargets" + "depsHash" + "extraCacheInstall" + "extraBuildSetup" + "extraBuildInstall" ]; attrs = cleanAttrs baseAttrs; base = stdenv.mkDerivation (attrs // { - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ bazel ]; @@ -69,7 +73,7 @@ let inherit cache; - nativeBuildInputs = (base.nativeBuildInputs or []) ++ [ + nativeBuildInputs = (base.nativeBuildInputs or [ ]) ++ [ coreutils ]; @@ -102,4 +106,5 @@ let runHook postInstall ''; }); -in build +in +build |