Skip to content

Commit

Permalink
vscode: specify runtimeDependencies instead of LD_LIBRARY_PATH
Browse files Browse the repository at this point in the history
This avoids glibc verions mismatches in vscode terminal, as
LD_LIBRARY_PATH leaks into terminal and break with user installed
executables.
  • Loading branch information
domenkozar committed Mar 4, 2020
1 parent fbe3eb2 commit 40d7ce7
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions pkgs/applications/editors/vscode/generic.nix
Expand Up @@ -62,6 +62,8 @@ in
else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
++ [ libsecret libXScrnSaver ];

runtimeDependencies = [ systemd.lib fontconfig.lib ];

nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;

dontBuild = true;
Expand Down Expand Up @@ -94,9 +96,5 @@ in
grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded
'';

preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ systemd fontconfig ]})
'';

inherit meta;
}

0 comments on commit 40d7ce7

Please sign in to comment.