From f9d9c610188462b1d6fc0f5cc661e06777282162 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 17 Apr 2019 11:42:37 +0200 Subject: [PATCH 1/3] vscode: use absolute predetermined path instead of heuristic Fixes #59725 --- pkgs/applications/editors/vscode/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 189c49cde35..a98ac42b4f8 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -108,6 +108,9 @@ in mkdir -p $out/share/pixmaps 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 ''; preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") '' From 42584ba5b2319d5b702f15370f45661f4710de2c Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Wed, 17 Apr 2019 11:56:07 +0200 Subject: [PATCH 2/3] vscode: add Synthetica as maintainer --- pkgs/applications/editors/vscode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index a98ac42b4f8..3748f8acdda 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -132,7 +132,7 @@ in homepage = https://code.visualstudio.com/; downloadPage = https://code.visualstudio.com/Updates; license = licenses.unfree; - maintainers = with maintainers; [ eadwu ]; + maintainers = with maintainers; [ eadwu synthetica ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } From bdb497f2d7e10b708abb3a5dcfabcfa4ac8fb5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 17 Apr 2019 12:31:49 +0200 Subject: [PATCH 3/3] vscode: check if substitution succeeded Co-Authored-By: Synthetica9 --- pkgs/applications/editors/vscode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 3748f8acdda..67c1ddf175f 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -111,6 +111,7 @@ in # 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") ''