diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-02 00:13:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-02 00:13:10 +0000 |
commit | 2918b2c876b74d0ba5e333676ee86228f51c24e8 (patch) | |
tree | 3aa9efd04a7b013474abd0e659f2978ef07bddfa /pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix | |
parent | a48f3268c7b745ffe9a057b3c5e5a2b97ef68c7a (diff) | |
parent | e32981ab32c921f0506a3a560512e3a34726eafe (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix')
-rw-r--r-- | pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix index 9c5ce50fa245a..7708c52c80b03 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix @@ -1,5 +1,9 @@ # Patched lldb for Rust language support. -{ fetchFromGitHub, runCommand, llvmPackages }: +{ + fetchFromGitHub, + runCommand, + llvmPackages, +}: let llvmSrc = fetchFromGitHub { owner = "vadimcn"; @@ -8,8 +12,9 @@ let rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7"; hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; }; -in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { - passthru = (oldAttrs.passthru or {}) // { +in +(llvmPackages.lldb.overrideAttrs (oldAttrs: rec { + passthru = (oldAttrs.passthru or { }) // { inherit llvmSrc; }; @@ -23,7 +28,8 @@ in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { echo "'lldb --version' returns: $versionOutput" echo "$versionOutput" | grep -q 'rust-enabled' ''; -})).override({ - monorepoSrc = llvmSrc; - libllvm = llvmPackages.libllvm.override({ monorepoSrc = llvmSrc; }); -}) +})).override + ({ + monorepoSrc = llvmSrc; + libllvm = llvmPackages.libllvm.override ({ monorepoSrc = llvmSrc; }); + }) |