nix: fix bazel under NixOS

This commit is contained in:
Malte Poll 2024-02-15 17:59:57 +01:00
parent a4d25646f5
commit 77ecd8d4ce
3 changed files with 71 additions and 5 deletions

View File

@ -57,6 +57,8 @@
openssl-static = pkgsUnstable.openssl.override { static = true; }; openssl-static = pkgsUnstable.openssl.override { static = true; };
bazel_7 = callPackage ./nix/packages/bazel.nix { pkgs = pkgsUnstable; nixpkgs = nixpkgsUnstable; };
in in
{ {
packages.mkosi = mkosiDev; packages.mkosi = mkosiDev;
@ -75,13 +77,13 @@
packages.awscli2 = pkgsUnstable.awscli2; packages.awscli2 = pkgsUnstable.awscli2;
packages.bazel_7 = pkgsUnstable.bazel_7; packages.bazel_7 = bazel_7;
packages.createrepo_c = pkgsUnstable.createrepo_c; packages.createrepo_c = pkgsUnstable.createrepo_c;
packages.dnf5 = pkgsUnstable.dnf5; packages.dnf5 = pkgsUnstable.dnf5;
devShells.default = import ./nix/shells/default.nix { pkgs = pkgsUnstable; }; devShells.default = callPackage ./nix/shells/default.nix { inherit bazel_7; };
formatter = nixpkgsUnstable.legacyPackages.${system}.nixpkgs-fmt; formatter = nixpkgsUnstable.legacyPackages.${system}.nixpkgs-fmt;
}); });

64
nix/packages/bazel.nix Normal file
View File

@ -0,0 +1,64 @@
{ nixpkgs
, symlinkJoin
, pkgs
, bazel_7
, lib
, substituteAll
, writeShellScriptBin
, bash
, coreutils
, diffutils
, file
, findutils
, gawk
, gnugrep
, gnupatch
, gnused
, gnutar
, gzip
, python3
, unzip
, which
, zip
}:
let
defaultShellUtils = [
bash
coreutils
diffutils
file
findutils
gawk
gnugrep
gnupatch
gnused
gnutar
gzip
python3
unzip
which
zip
];
bazel_with_action_env = bazel_7.overrideAttrs (oldAttrs: {
# https://github.com/NixOS/nixpkgs/pull/262152#issuecomment-1879053113
patches = (oldAttrs.patches or [ ]) ++ [
(substituteAll {
src = "${nixpkgs}/pkgs/development/tools/build-managers/bazel/bazel_6/actions_path.patch";
actionsPathPatch = lib.makeBinPath defaultShellUtils;
})
];
});
in
symlinkJoin {
name = "bazel_7";
paths = [ bazel_with_action_env ];
buildInputs = [ pkgs.makeWrapper ];
# This wrapper is required in Nix shells to make them work with
# bazel's --incompatible_sandbox_hermetic_tmp flag.
# See https://github.com/bazelbuild/bazel/issues/5900
postBuild = ''
wrapProgram $out/bin/bazel \
--unset TMPDIR \
--unset TMP
'';
}

View File

@ -1,6 +1,6 @@
{ pkgs, ... }: { mkShell, git, bazel_7 }:
pkgs.mkShell { mkShell {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = [
bazel_7 bazel_7
git git
]; ];