From 40d7ce78281319631feceac6e0579a6d01b76b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Mar 2020 11:54:33 +0100 Subject: [PATCH] vscode: specify runtimeDependencies instead of LD_LIBRARY_PATH This avoids glibc verions mismatches in vscode terminal, as LD_LIBRARY_PATH leaks into terminal and break with user installed executables. --- pkgs/applications/editors/vscode/generic.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index bdcf786f61d..ace4bbe9cdc 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -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; @@ -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; }