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

Merge pull request #59766 from Synthetica9/vscode-absolute-path2 

vscode: use absolute predetermined path instead of heuristic
This commit is contained in:
Jörg Thalheim 2019-04-17 17:42:30 +01:00 committed by GitHub
parent 44afc81af1 bdb497f2d7
commit 6890f32e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,10 @@ in
mkdir -p $out/share/pixmaps mkdir -p $out/share/pixmaps
cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
# Override the previously determined VSCODE_PATH with the one we know to be correct
sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/code
grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/code # check if sed succeeded
''; '';
preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") '' preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") ''
@ -129,7 +133,7 @@ in
homepage = https://code.visualstudio.com/; homepage = https://code.visualstudio.com/;
downloadPage = https://code.visualstudio.com/Updates; downloadPage = https://code.visualstudio.com/Updates;
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ eadwu ]; maintainers = with maintainers; [ eadwu synthetica ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
}; };
} }