vscode-extensions.vadimcn.vscode-lldb: cleanup lldb derivation

Author: khaneliman

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  runCommand,
   rustPlatform,
   makeWrapper,
   llvmPackages,
@@ -33,7 +32,7 @@ let
   };
 
   # need to build a custom version of lldb and llvm for enhanced rust support
-  lldb = (import ./lldb.nix { inherit fetchFromGitHub runCommand llvmPackages; });
+  lldb = (import ./lldb.nix { inherit fetchFromGitHub llvmPackages; });
 
   adapter = rustPlatform.buildRustPackage {
     pname = "${pname}-adapter";

pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix

@@ -1,7 +1,6 @@
 # Patched lldb for Rust language support.
 {
   fetchFromGitHub,
-  runCommand,
   llvmPackages,
 }:
 let
@@ -12,24 +11,25 @@ let
     rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7";
     hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw=";
   };
-in
-(llvmPackages.lldb.overrideAttrs (oldAttrs: rec {
-  passthru = (oldAttrs.passthru or { }) // {
-    inherit llvmSrc;
-  };
 
-  doInstallCheck = true;
+  lldbDrv = llvmPackages.lldb.overrideAttrs (oldAttrs: {
+    passthru = (oldAttrs.passthru or { }) // {
+      inherit llvmSrc;
+    };
 
-  # installCheck for lldb_14 currently broken
-  # https://github.com/NixOS/nixpkgs/issues/166604#issuecomment-1086103692
-  # ignore the oldAttrs installCheck
-  installCheckPhase = ''
-    versionOutput="$($out/bin/lldb --version)"
-    echo "'lldb --version' returns: $versionOutput"
-    echo "$versionOutput" | grep -q 'rust-enabled'
-  '';
-})).override
-  ({
-    monorepoSrc = llvmSrc;
-    libllvm = llvmPackages.libllvm.override ({ monorepoSrc = llvmSrc; });
-  })
+    doInstallCheck = true;
+
+    # installCheck for lldb_14 currently broken
+    # https://github.com/NixOS/nixpkgs/issues/166604#issuecomment-1086103692
+    # ignore the oldAttrs installCheck
+    installCheckPhase = ''
+      versionOutput="$($out/bin/lldb --version)"
+      echo "'lldb --version' returns: $versionOutput"
+      echo "$versionOutput" | grep -q 'rust-enabled'
+    '';
+  });
+in
+lldbDrv.override {
+  monorepoSrc = llvmSrc;
+  libllvm = llvmPackages.libllvm.override { monorepoSrc = llvmSrc; };
+}