Skip to content

feat(nix): skip building bolt in nix with NIX_SKIP_BOLT #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2024
Merged

feat(nix): skip building bolt in nix with NIX_SKIP_BOLT #664

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ let
unstablePkgs = import ./infra/nix/common/unstable_pkgs.nix;

custom_clickhouse = import ./infra/nix/pkgs/clickhouse.nix { inherit (pkgs) stdenv fetchurl lib; };

envSkipBolt = builtins.getEnv "NIX_SKIP_BOLT" == "1";
custom_bolt = import ./infra/nix/bolt/default.nix;

useSccache = builtins.getEnv "USE_SCCACHE" == "1";
Expand Down Expand Up @@ -34,7 +36,6 @@ in
terraform

# Tools
custom_bolt
cloc
curl
docker-client # Standardize client CLI since older clients have breaking changes
Expand Down Expand Up @@ -65,15 +66,18 @@ in

# Fixes "cannot change locale" warning
glibcLocales
] ++ extraInputs ++ (
pkgs.lib.optionals stdenv.isDarwin [
libiconv # See https://stackoverflow.com/a/69732679
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Foundation
]
);
]
++ lib.optional (builtins.getEnv "NIX_SKIP_BOLT" != "1") custom_bolt
++ extraInputs
++ (
pkgs.lib.optionals stdenv.isDarwin [
libiconv # See https://stackoverflow.com/a/69732679
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Foundation
]
);
shellHook = ''
# Setup Git LFS
git lfs install --manual > /dev/null
Expand Down