From 4168ee57ec73dc2c3bb149db3ca4bd5cd4db93bd Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Thu, 15 May 2025 21:13:13 +0000 Subject: [PATCH] dev-shell: Drop bear dependency Since the autotools-based build system has been removed and meson already generates compile database there's no need to have it in the devshell. (cherry picked from commit 67535263a577699002b9b0d05c2eea3f9615dd73) --- packaging/dev-shell.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix index f9b19c3c4..df584e743 100644 --- a/packaging/dev-shell.nix +++ b/packaging/dev-shell.nix @@ -114,9 +114,6 @@ pkgs.nixComponents2.nix-util.overrideAttrs ( (pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript) pkgs.buildPackages.nixfmt-rfc-style ] - # TODO: Remove the darwin check once - # https://github.com/NixOS/nixpkgs/pull/291814 is available - ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) ( lib.hiPrio pkgs.buildPackages.clang-tools );