public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70486 from DarkDNA/mac-fixes/vscode

Browse Source 
vscode: Make it so that it places the .app in $out/Applications on macOS
This commit is contained in:
Mario Rodas 2019-10-05 18:57:12 -05:00 committed by GitHub
commit 6106e8d028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/vscode/generic.nix
View File

@ -69,9 +69,9 @@ in
installPhase = installPhase =
if system == "x86_64-darwin" then '' if system == "x86_64-darwin" then ''
mkdir -p $out/lib/vscode $out/bin mkdir -p "$out/Applications/${longName}.app" $out/bin
cp -r ./* $out/lib/vscode cp -r ./* "$out/Applications/${longName}.app"
ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName}
'' else '' '' else ''
mkdir -p $out/lib/vscode $out/bin mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode cp -r ./* $out/lib/vscode

8
pkgs/applications/editors/vscode/vscodium.nix
View File

@ -14,8 +14,14 @@ let
x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb"; x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb";
x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5"; x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5";
}.${system}; }.${system};
sourceRoot = {
x86_64-linux = ".";
x86_64-darwin = "";
}.${system};
in in
callPackage ./generic.nix rec { callPackage ./generic.nix rec {
inherit sourceRoot;
version = "1.38.1"; version = "1.38.1";
pname = "vscodium"; pname = "vscodium";
@ -29,8 +35,6 @@ in
inherit sha256; inherit sha256;
}; };
sourceRoot = ".";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = '' description = ''
Open source source code editor developed by Microsoft for Windows, Open source source code editor developed by Microsoft for Windows,