Unverified Commit 87fe42d7 authored by Austin Horstman's avatar Austin Horstman
Browse files

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

parent 20d2e6da

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

+1 −2
Original line number Diff line number Diff line
@@ -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

+20 −20
Original line number Diff line number Diff line 
# Patched lldb for Rust language support.

{

  fetchFromGitHub,

  runCommand,

  llvmPackages,

}:

let
@@ -12,8 +11,8 @@ let 
    rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7";

    hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw=";

  };

in

(llvmPackages.lldb.overrideAttrs (oldAttrs: rec {



  lldbDrv = llvmPackages.lldb.overrideAttrs (oldAttrs: {

    passthru = (oldAttrs.passthru or { }) // {

      inherit llvmSrc;

    };
@@ -28,8 +27,9 @@ in 
      echo "'lldb --version' returns: $versionOutput"

      echo "$versionOutput" | grep -q 'rust-enabled'

    '';

})).override

  ({

  });

in

lldbDrv.override {

  monorepoSrc = llvmSrc;

    libllvm = llvmPackages.libllvm.override ({ monorepoSrc = llvmSrc; });

  })
 
  libllvm = llvmPackages.libllvm.override { monorepoSrc = llvmSrc; };

}