diff options
author | Domen Kožar <domen@dev.si> | 2020-03-04 11:54:33 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2020-03-04 11:55:41 +0100 |
commit | 40d7ce78281319631feceac6e0579a6d01b76b33 (patch) | |
tree | a4d96b4dfca1c6254cde31c6cd2167d843b37398 /pkgs/applications/editors | |
parent | fbe3eb29dd1989dd05bbd86b425ba7cdaf6cbb8b (diff) | |
download | nixlib-40d7ce78281319631feceac6e0579a6d01b76b33.tar nixlib-40d7ce78281319631feceac6e0579a6d01b76b33.tar.gz nixlib-40d7ce78281319631feceac6e0579a6d01b76b33.tar.bz2 nixlib-40d7ce78281319631feceac6e0579a6d01b76b33.tar.lz nixlib-40d7ce78281319631feceac6e0579a6d01b76b33.tar.xz nixlib-40d7ce78281319631feceac6e0579a6d01b76b33.tar.zst nixlib-40d7ce78281319631feceac6e0579a6d01b76b33.zip |
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.
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/vscode/generic.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index bdcf786f61d2..ace4bbe9cdc7 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; } |