From 0f3d546116d7e035a7d201256bd9c6121103a884 Mon Sep 17 00:00:00 2001
From: IvarWithoutBones <ivar.scholten@protonmail.com>
Date: Mon, 20 Dec 2021 21:52:57 +0100
Subject: [PATCH] buildDotnetModule: set dontWrapGApps to avoid double wrapping

This also removes the flag from opentabletdriver and opentracker, which
manually set it before.
---
 pkgs/build-support/build-dotnet-module/default.nix | 3 +++
 pkgs/tools/X11/opentabletdriver/default.nix        | 2 --
 pkgs/tools/games/opentracker/default.nix           | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix
index 93077f438bff..b0b41dc59cf0 100644
--- a/pkgs/build-support/build-dotnet-module/default.nix
+++ b/pkgs/build-support/build-dotnet-module/default.nix
@@ -110,6 +110,9 @@ let
     # Stripping breaks the executable
     dontStrip = true;
 
+    # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping
+    dontWrapGApps = true;
+
     DOTNET_NOLOGO = true; # This disables the welcome message.
     DOTNET_CLI_TELEMETRY_OPTOUT = true;
 
diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix
index de3b983c91da..2b123355f7e7 100644
--- a/pkgs/tools/X11/opentabletdriver/default.nix
+++ b/pkgs/tools/X11/opentabletdriver/default.nix
@@ -85,8 +85,6 @@ buildDotnetModule rec {
     })
   ];
 
-  dontWrapGApps = true;
-
   passthru = {
     updateScript = ./update.sh;
     tests = {
diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix
index d774fcb8f1f0..a66d6f4aef53 100644
--- a/pkgs/tools/games/opentracker/default.nix
+++ b/pkgs/tools/games/opentracker/default.nix
@@ -52,7 +52,6 @@ buildDotnetModule rec {
   ];
 
   autoPatchelfIgnoreMissingDeps = true; # Attempts to patchelf unneeded SOs
-  dontWrapGApps = true; # gappsWrapperArgs gets included when wrapping the application for dotnet.
 
   meta = with lib; {
     description = "A tracking application for A Link to the Past Randomizer";