Unverified Commit 69ce3314 authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

llvmPackages.lldbPlugins: drop llvm/clang rebuild (#366401)

parents c72a0d34 1259856b

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

+9 −15
Original line number Diff line number Diff line
@@ -317,20 +317,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
@@ -671,6 +657,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 =
@@ -1222,7 +1216,7 @@ let 
  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

in

{

  inherit tools libraries lldbPlugins;

  inherit tools libraries;

  inherit (metadata) release_version;

}

// (noExtend libraries)