nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-17 22:41:08 +01:00
Code Activity

Merge remote-tracking branch 'origin/2.29-maintenance' into sync-2.29

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-16 12:53:24 +02:00
commit 9088d5b525
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packaging/dev-shell.nix
View file

@ -119,9 +119,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
)