From 8213bd819954ee50e740392ed20dfec150eae207 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 15 Mar 2022 00:23:25 +0400 Subject: [PATCH 1/2] vscode: gtk2 is not a dependency --- pkgs/applications/editors/vscode/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 672eb4b27ba1..030b696e14e6 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeDesktopItem , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook -, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook +, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap , writeShellScriptBin @@ -64,7 +64,7 @@ let }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk ] ++ atomEnv.packages); + ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; From 188743537d4a306dd8dbe5aa5e9cc2b671215d81 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 15 Mar 2022 00:24:17 +0400 Subject: [PATCH 2/2] vscode: don't dump all the commands to a file This is necessary due to cp -r ./* commands that copy this debug file --- pkgs/applications/editors/vscode/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 030b696e14e6..d704497b4f0c 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -72,6 +72,7 @@ let dontBuild = true; dontConfigure = true; + noDumpEnvVars = true; installPhase = '' runHook preInstall