diff options
| author | Jean-Francois Chevrette <jfchevrette@gmail.com> | 2022-01-12 13:33:06 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-02-16 23:59:34 +0000 |
| commit | b60594109e7696926c5a218fee90a8cacb9d6ea0 (patch) | |
| tree | d5722ddb20bfe009202dcbbda203f8192b838f4a | |
| parent | Merge pull request #160368 from NixOS/backport-160270-to-release-21.11 (diff) | |
| download | nixpkgs-b60594109e7696926c5a218fee90a8cacb9d6ea0.tar.gz | |
add support for aarch64-darwin and x86_64-darwin
(cherry picked from commit 23b88f85c8797337038f090895973d211968d64a)
| -rw-r--r-- | pkgs/misc/vscode-extensions/python/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index beaa8d557a75..a0e64b9197bc 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -72,13 +72,15 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { icu curl openssl + ] ++ lib.optionals stdenv.isLinux [ lttng-ust-2-10 musl ]; nativeBuildInputs = [ - autoPatchelfHook python3.pkgs.wrapPython + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ]; pythonPath = with python3.pkgs; [ @@ -101,6 +103,8 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process declare kept_aside="${{ "x86_64-linux" = "attach_linux_amd64.so"; + "aarch64-darwin" = "attach_x86_64.dylib"; + "x86_64-darwin" = "attach_x86_64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" mv "$kept_aside" "$kept_aside.hidden" rm *.so *.dylib *.dll *.exe *.pdb @@ -118,7 +122,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { meta = with lib; { license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; maintainers = [ maintainers.jraygauthier ]; }; } |