Skip to content

Commit 1259856

Browse files
committed
llvmPackages.lldbPlugins: drop llvm/clang rebuild
Eliminate rebuilding the following packages on darwin just for this attrset: < DarwinTools-1.drv < DarwinTools-1.tar.gz.drv < IOKit-11.0.drv < builder.pl.drv < clang-16.0.6.drv < clang-at-least-16-LLVMgold-path.patch.drv < clang-darwin-An-OS-version-preprocessor-define.patch.drv < clang-src-16.0.6.drv < llvm-16.0.6.drv < llvm-src-16.0.6.drv < psutil-6.0.0.tar.gz.drv < python3-3.12.7-env.drv < python3.12-psutil-6.0.0.drv < sysctl-system_cmds-1012.drv found by diffing the output of the command below before and after this change: ``` nix-store --query -R $(nix-instantiate -A llvmPackages.lldbPlugins) | \ cut -d- -f 2- | sort ```
1 parent 087408a commit 1259856

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

pkgs/development/compilers/llvm/common/default.nix

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -329,20 +329,6 @@ let
329329
};
330330
};
331331

332-
lldbPlugins = lib.makeExtensible (
333-
lldbPlugins:
334-
let
335-
callPackage = newScope (
336-
lldbPlugins
337-
// {
338-
inherit stdenv;
339-
inherit (tools) lldb;
340-
}
341-
);
342-
in
343-
lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
344-
);
345-
346332
tools = lib.makeExtensible (
347333
tools:
348334
let
@@ -668,6 +654,14 @@ let
668654
);
669655
};
670656

657+
lldbPlugins = lib.makeExtensible (
658+
lldbPlugins:
659+
let
660+
callPackage = newScope ( lldbPlugins // tools // args // metadata );
661+
in
662+
lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
663+
);
664+
671665
lldb = callPackage ./lldb.nix (
672666
{
673667
patches =
@@ -1224,7 +1218,7 @@ let
12241218
noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];
12251219
in
12261220
{
1227-
inherit tools libraries lldbPlugins;
1221+
inherit tools libraries;
12281222
inherit (metadata) release_version;
12291223
}
12301224
// (noExtend libraries)

0 commit comments

Comments
 (0)