Skip to content

Commit 69ce331

Browse files
authored
llvmPackages.lldbPlugins: drop llvm/clang rebuild (NixOS#366401)
2 parents c72a0d3 + 1259856 commit 69ce331

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
@@ -317,20 +317,6 @@ let
317317
};
318318
};
319319

320-
lldbPlugins = lib.makeExtensible (
321-
lldbPlugins:
322-
let
323-
callPackage = newScope (
324-
lldbPlugins
325-
// {
326-
inherit stdenv;
327-
inherit (tools) lldb;
328-
}
329-
);
330-
in
331-
lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
332-
);
333-
334320
tools = lib.makeExtensible (
335321
tools:
336322
let
@@ -671,6 +657,14 @@ let
671657
);
672658
};
673659

660+
lldbPlugins = lib.makeExtensible (
661+
lldbPlugins:
662+
let
663+
callPackage = newScope ( lldbPlugins // tools // args // metadata );
664+
in
665+
lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
666+
);
667+
674668
lldb = callPackage ./lldb.nix (
675669
{
676670
patches =
@@ -1222,7 +1216,7 @@ let
12221216
noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];
12231217
in
12241218
{
1225-
inherit tools libraries lldbPlugins;
1219+
inherit tools libraries;
12261220
inherit (metadata) release_version;
12271221
}
12281222
// (noExtend libraries)

0 commit comments

Comments
 (0)