Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vscode: use absolute predetermined path instead of heuristic #59766

Merged
merged 3 commits into from Apr 17, 2019
Merged

vscode: use absolute predetermined path instead of heuristic #59766

merged 3 commits into from Apr 17, 2019

Conversation

Synthetica9
Copy link
Member

@Synthetica9 Synthetica9 commented Apr 17, 2019 •
edited

Fixes #59725

Motivation for this change

#59725

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Synthetica9 Synthetica9 mentioned this pull request Apr 17, 2019
Closed
@Mic92 @Synthetica9
vscode: check if substitution succeeded
bdb497f 
Co-Authored-By: Synthetica9 <git@hilhorst.be>
@Mic92 Mic92 merged commit 6890f32 into NixOS:master Apr 17, 2019
@Mic92
Copy link
Member

Mic92 commented Apr 17, 2019

Does this need a backport?

@worldofpeace
Copy link
Contributor

Most changes to vscode should be backported

eadwu
eadwu reviewed Apr 17, 2019
View reviewed changes
pkgs/applications/editors/vscode/default.nix
@@ -108,6 +108,10 @@ 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
Copy link
Member

@eadwu eadwu Apr 17, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$out/bin/code should be $out/bin/${executableName}, same to the line below.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #59798.

@eadwu eadwu mentioned this pull request Apr 17, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@eadwu eadwu eadwu left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

VSCode: No such file or directory with User Env
5 participants
@Synthetica9 @Mic92 @worldofpeace @eadwu @GrahamcOfBorg