Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8121ff254835
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1918bb0d90e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 4, 2020

  1. 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.

(cherry picked from commit 40d7ce7)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Mar 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    domenkozar Domen Kožar
    GPG key ID: C2FFBCAFD2C24246
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d1918bb View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 pkgs/applications/editors/vscode/generic.nix
6 changes: 2 additions & 4 deletions pkgs/applications/editors/vscode/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
}