From 1259856bac889331cf3bce2014651bb573d797db Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 18 Dec 2024 18:00:15 -0800 Subject: [PATCH] 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 ``` --- .../compilers/llvm/common/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index b53f76e96c11..0dabfee39359 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -329,20 +329,6 @@ let }; }; - lldbPlugins = lib.makeExtensible ( - lldbPlugins: - let - callPackage = newScope ( - lldbPlugins - // { - inherit stdenv; - inherit (tools) lldb; - } - ); - in - lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; } - ); - tools = lib.makeExtensible ( tools: let @@ -668,6 +654,14 @@ let ); }; + lldbPlugins = lib.makeExtensible ( + lldbPlugins: + let + callPackage = newScope ( lldbPlugins // tools // args // metadata ); + in + lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; } + ); + lldb = callPackage ./lldb.nix ( { patches = @@ -1224,7 +1218,7 @@ let noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; in { - inherit tools libraries lldbPlugins; + inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries)