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.

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: 1.30.2 -> 1.31.0 #55362

Merged
merged 1 commit into from Feb 10, 2019
Merged

vscode: 1.30.2 -> 1.31.0 #55362

merged 1 commit into from Feb 10, 2019

Conversation

eadwu
Copy link
Member

@eadwu eadwu commented Feb 6, 2019 •
edited

Motivation for this change

Tested on x86_64.

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 nox --run "nox-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.

@veprbl
Copy link
Member

veprbl commented Feb 6, 2019

@eadwu do you think you could add yourself to meta.maintainers?

@eadwu
Copy link
Member Author

eadwu commented Feb 6, 2019 •
edited

Just reverted #52419 on my local nixpkgs so can someone verify whether or not the native modules have their dependencies? Such as for ldd result/lib/vscode/resources/app/node_modules.asar.unpacked/node-pty/build/Release/pty.node, since I'm getting libstdc++.so.6 => not found.

Actually seems to work without it so let's leave it like this.

@worldofpeace
Copy link
Contributor

worldofpeace commented Feb 6, 2019 •
edited

Yeah I get libstdc++.so.6 => not found as well.

Guess we can fix that later.

Edit:

Wait that actually is a problem 😄

You said #52419 was a fix for this?
Looks better than what people usually do like

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index ebcf8af0627..54f77cf58a8 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
-  gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret,
+  gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret, at-spi2-atk,
   isInsiders ? false }:
 
 let
@@ -27,6 +27,7 @@ let
     "${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0"
     "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1"
     "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1"
+    "${lib.makeLibraryPath [at-spi2-atk]}"
     "$out/lib/vscode"
   ];
 
@@ -126,6 +127,9 @@ in
       keymapping.node"
 
       ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0
+
+       wrapProgram $out/lib/vscode/${executableName} \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ stdenv.cc.cc ]}
     '';
 
     meta = with stdenv.lib; {

@worldofpeace worldofpeace mentioned this pull request Feb 6, 2019
Merged
10 tasks
@worldofpeace worldofpeace merged commit 20e2f83 into NixOS:master Feb 10, 2019
@worldofpeace
Copy link
Contributor

Thanks @eadwu ✨

@eadwu
Copy link
Member Author

eadwu commented Feb 10, 2019

Should this still be backported, considering the next stable is coming pretty soon?

@worldofpeace
Copy link
Contributor

Should this still be backported, considering the next stable is coming pretty soon?

Backporting this one should be fine, even with the next stable coming soon.
We'd stop once 18.09 reaches eol.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 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.

None yet
4 participants
@eadwu @veprbl @worldofpeace @GrahamcOfBorg