Skip to content

Commit

Permalink
feat(nix): skip building bolt in nix with NIX_SKIP_BOLT
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanFlurry committed Apr 11, 2024
1 parent 018a883 commit 21e9a46
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions shell.nix
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

0 comments on commit 21e9a46

Please sign in to comment.