diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/vscode/generic.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/vscode/generic.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 0b30d44908d8..1742c1e0a0af 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -15,11 +15,7 @@ , executableName, longName, shortName, pname, updateScript , dontFixup ? false , rev ? null, vscodeServer ? null - -# sourceExecutableName is the name of the binary in the source archive, over -# which we have no control , sourceExecutableName ? executableName - , useVSCodeRipgrep ? false , ripgrep }: @@ -73,7 +69,7 @@ let buildInputs = [ libsecret libXScrnSaver libxshmfence ] ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages); - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland ]; + runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ @@ -115,9 +111,6 @@ let # The credentials should be stored in a secure keychain already, so the benefit of this is questionable # in the first place. rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt - - # Unbundle libglvnd as VSCode doesn't include libGLESv2.so.2 which is necessary for GPU acceleration - rm -rf $out/lib/vscode/libGLESv2.so '') + '' runHook postInstall ''; @@ -126,7 +119,6 @@ let gappsWrapperArgs+=( # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags ${lib.escapeShellArg commandLineArgs} ) @@ -161,6 +153,10 @@ let chmod +x ${vscodeRipgrep} ''); + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --add-needed ${libglvnd}/lib/libGLESv2.so.2 $out/lib/vscode/${executableName} + ''; + inherit meta; }; |