From 70d7d6eefa40a486de4c41ebd5fa4f859151553e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 12:48:48 +0200 Subject: [PATCH 1/8] signal-desktop: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 6afccfaaa07..96c6809b045 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, makeWrapper, nixosTests , gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; buildInputs = [ From 6d06f47584813ec31e5ad167e3f488fbebaac7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 13:05:43 +0200 Subject: [PATCH 2/8] brave: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/applications/networking/browsers/brave/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index b216d750d56..79b9b498fbd 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook +{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper , dpkg , alsa-lib , at-spi2-atk @@ -102,7 +102,10 @@ stdenv.mkDerivation rec { dontPatchELF = true; doInstallCheck = true; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ + dpkg + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH From a6977778089a7f9b31335e5d202cf20798705b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 13:09:04 +0200 Subject: [PATCH 3/8] discord: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- .../networking/instant-messengers/discord/linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 05833c1eeaf..f5d984bf3a6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; dontWrapGApps = true; From a2ee3ed3f284c5b33432fbd55d07a624f01ff8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 13:11:10 +0200 Subject: [PATCH 4/8] vscode: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/applications/editors/vscode/generic.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 9a4f1b92d41..e1003180050 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook +, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap , writeShellScriptBin @@ -68,7 +68,12 @@ let runtimeDependencies = lib.optional stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar wrapGAppsHook ]; + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + nodePackages.asar + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontBuild = true; dontConfigure = true; From 86e7fa945e310b1c21ea837109879e7c8b935e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:19:53 +0200 Subject: [PATCH 5/8] tlaplusToolbox: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/applications/science/logic/tlaplus/toolbox.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index e13fd578927..d84f0b2abf6 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ + makeWrapper + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontWrapGApps = true; From 9709c5f4a4ba7b3e2889b4f1fe79c9e42e829909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:25:43 +0200 Subject: [PATCH 6/8] cryptomator: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/tools/security/cryptomator/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 76b5f521663..5a1886e49e5 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -98,7 +98,13 @@ in stdenv.mkDerivation rec { cp ${src}/dist/linux/common/application-vnd.cryptomator.vault.xml $out/share/mime/packages/application-vnd.cryptomator.vault.xml ''; - nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ]; + nativeBuildInputs = [ + autoPatchelfHook + maven + makeWrapper + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + jdk + ]; buildInputs = [ fuse jre glib jffi ]; meta = with lib; { From 220428039c8cdb58dcdde4d766ef99fac71c285d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:27:58 +0200 Subject: [PATCH 7/8] bluej: fix with non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation assumed quotes to be expanded, which the binary wrapper (which wrapGAppsHook uses since #164163) will not do. --- pkgs/applications/editors/bluej/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index bfc413c24ad..552358319e1 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preFixup = '' makeWrapper ${jdk}/bin/java $out/bin/bluej \ "''${gappsWrapperArgs[@]}" \ - --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp $out/share/bluej/bluej.jar bluej.Boot" ''; meta = with lib; { From 757f518f803e684500076f169078ab0de8a9835b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:28:35 +0200 Subject: [PATCH 8/8] gmtp: fix with non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation assumed quotes to be expanded, which the binary wrapper (which wrapGAppsHook uses since #164163) will not do. --- pkgs/applications/misc/gmtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 1479fe7bc7d..5f03b8ea7e7 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + gappsWrapperArgs+=(--add-flags "--datapath $out/share"); ''; meta = {