diff options
| author | Matthew Leach <dev@mattleach.net> | 2021-07-11 21:51:17 +0100 |
|---|---|---|
| committer | Matthew Leach <dev@mattleach.net> | 2021-07-11 21:51:17 +0100 |
| commit | 7f8828230fa180acb82517f73d7f903378c1d707 (patch) | |
| tree | 961f4ffd391e9612e667759027623a616f7374bc /pkgs/applications | |
| parent | a03ac51a06a145aa3a0cabc57be172971deaade9 (diff) | |
| download | nixpkgs-7f8828230fa180acb82517f73d7f903378c1d707.tar nixpkgs-7f8828230fa180acb82517f73d7f903378c1d707.tar.gz nixpkgs-7f8828230fa180acb82517f73d7f903378c1d707.tar.bz2 nixpkgs-7f8828230fa180acb82517f73d7f903378c1d707.tar.lz nixpkgs-7f8828230fa180acb82517f73d7f903378c1d707.tar.xz nixpkgs-7f8828230fa180acb82517f73d7f903378c1d707.tar.zst nixpkgs-7f8828230fa180acb82517f73d7f903378c1d707.zip | |
vscode: Add arm64-darwin support
Download and extract the prebuilt arm64-darwin archive.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/vscode/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/vscode/vscode.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index d9a4ed2a894..a7f9fb328ff 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -77,7 +77,7 @@ let installPhase = '' runHook preInstall - '' + (if system == "x86_64-darwin" then '' + '' + (if stdenv.isDarwin then '' mkdir -p "$out/Applications/${longName}.app" $out/bin cp -r ./* "$out/Applications/${longName}.app" ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" $out/bin/${executableName} diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 3ee9d90753c..e9dc88376bc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -7,15 +7,17 @@ let x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; aarch64-linux = "linux-arm64"; + aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; }.${system}; - archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { x86_64-linux = "06as63444m2036vk4180dfpavmp9l07qc1jfc4gg86j0apdxr6sh"; x86_64-darwin = "0dxchqwk3flv2cr542y1l7c06lak9zzj09f2kljsan6gs6zbls2b"; aarch64-linux = "0pdbganyc59mll3232b26cc6fi8a8kpvjm5qky4qr4pk4jsj2r6q"; + aarch64-darwin = "00pax1hakj5l21j7fm1b05s8kkfnbvgfs9h7f27ad379n6482gxl"; armv7l-linux = "1g63xh3k1nm8kls674qavmyl7csb3m4d7ywc0512far76lw39rvr"; }.${system}; in @@ -57,6 +59,6 @@ in downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } |