From 566ef06cf5aba71b850838d2fe9bbd7828475e69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Nov 2021 19:06:22 +0100
Subject: [PATCH 1/2] obs-studio: use wrapGAppsHook to add required
 org.gtk.Settings.ColorChooser schema

Fixes https://github.com/NixOS/nixpkgs/issues/145661.
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 85a072547714..7454cc1eb297 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -25,12 +25,11 @@
 , pkg-config
 , libvlc
 , mbedtls
-
+, wrapGAppsHook
 , scriptingSupport ? true
 , luajit
 , swig
 , python3
-
 , alsaSupport ? stdenv.isLinux
 , alsa-lib
 , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
@@ -69,6 +68,7 @@ mkDerivation rec {
     cmake
     pkg-config
     makeWrapper
+    wrapGAppsHook
   ]
   ++ optional scriptingSupport swig;
 

From 90af5cacfbcf6b3c57a33feb1e19be797b27e7e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Nov 2021 10:14:39 +0100
Subject: [PATCH 2/2] obs-studio: avoid double-wrapping the obs binary

Suggested in https://github.com/NixOS/nixpkgs/pull/145664#issuecomment-968107267.
---
 pkgs/applications/video/obs-studio/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 7454cc1eb297..31f478c47c0b 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -21,7 +21,6 @@
 , curl
 , wayland
 , xorg
-, makeWrapper
 , pkg-config
 , libvlc
 , mbedtls
@@ -67,7 +66,6 @@ mkDerivation rec {
     addOpenGLRunpath
     cmake
     pkg-config
-    makeWrapper
     wrapGAppsHook
   ]
   ++ optional scriptingSupport swig;
@@ -121,9 +119,13 @@ mkDerivation rec {
     "-DCEF_ROOT_DIR=../../cef"
   ];
 
-  qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
-  ];
+  dontWrapGApps = true;
+  preFixup = ''
+    qtWrapperArgs+=(
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libX11 libvlc ]}"
+      ''${gappsWrapperArgs[@]}
+    )
+  '';
 
   postFixup = lib.optionalString stdenv.isLinux ''
     addOpenGLRunpath $out/lib/lib*.so