diff options
| author | jade <lix@jade.fyi> | 2024-05-17 20:44:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-17 20:44:02 +0000 |
| commit | 0d2cc81956580bbe1459cdfcc0ace240111e827d (patch) | |
| tree | b9dacb6ec00c3a635b983c9fcd4378394801a5b6 | |
| parent | 93b7edfd077e056f9deb7656be796ea49a162f51 (diff) | |
| parent | e1119f4378e5d7fabdb7d7619927210655e31022 (diff) | |
Merge "make lix dev shells un-bear-able since we un-make them now" into main
| -rw-r--r-- | package.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/package.nix b/package.nix index 83a4411ec..fe56a4003 100644 --- a/package.nix +++ b/package.nix @@ -375,7 +375,6 @@ stdenv.mkDerivation (finalAttrs: { just, nixfmt, glibcLocales, - bear, pre-commit-checks, clang-tools, llvmPackages, @@ -418,7 +417,6 @@ stdenv.mkDerivation (finalAttrs: { llvmPackages.clang-unwrapped.dev ] ++ lib.optional (pre-commit-checks ? enabledPackages) pre-commit-checks.enabledPackages - ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) bear ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform clangbuildanalyzer) clangbuildanalyzer ++ finalAttrs.checkInputs; |