From f3d1fee59da1bc965433184e000f0e023aa4fa5c Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 16 Jun 2020 09:39:54 +0100 Subject: [PATCH] nix/pkgs: add bazel-run userenv --- nix/pkgs/bazel-run.nix | 19 +++++++++++++++++++ nix/pkgs/default.nix | 1 + ops/nixos/lib/hgrc | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 nix/pkgs/bazel-run.nix diff --git a/nix/pkgs/bazel-run.nix b/nix/pkgs/bazel-run.nix new file mode 100644 index 0000000000..e9ca8a2a38 --- /dev/null +++ b/nix/pkgs/bazel-run.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: +let + bazelTop = pkgs.buildFHSUserEnv { + name = "bazel-wrap"; + targetPkgs = pkgs: [ + (pkgs.bazel.override { enableNixHacks = true; }) + pkgs.adoptopenjdk-hotspot-bin-13 + pkgs.zlib + pkgs.python + pkgs.curl + pkgs.nodejs + pkgs.yarn + pkgs.git + pkgs.jetbrains.idea-community + pkgs.gcc + ]; + }; +in + bazelTop // { override = x: bazelTop; } diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index faf706b95e..7da5b9d45a 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -3,6 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 args: { + bazel-run = import ./bazel-run.nix args; javaws-env = import ./javaws-env.nix args; plex-pass = import ./plex-pass.nix args; secretsync = import ./secretsync args; diff --git a/ops/nixos/lib/hgrc b/ops/nixos/lib/hgrc index 7bf2173dea..50acf92ef8 100644 --- a/ops/nixos/lib/hgrc +++ b/ops/nixos/lib/hgrc @@ -59,4 +59,4 @@ amend = evolve = topic = hggit = -purge = \ No newline at end of file +purge =