From 3f682fbe444169a7447050b8841278f8d58f64ec Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 25 Aug 2022 09:47:49 +0200
Subject: [PATCH 1/2] obconf: add GSettings schemas path

---
 pkgs/tools/X11/obconf/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 5ffef951d51a..8b6e12bd378d 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk3, openbox,
-  imlib2, libxml2, libstartup_notification, makeWrapper, libSM }:
+  imlib2, libxml2, libstartup_notification, wrapGAppsHook, libSM }:
 
 stdenv.mkDerivation rec {
   pname = "obconf";
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    makeWrapper
     pkg-config
+    wrapGAppsHook
   ];
 
   buildInputs = [
@@ -30,10 +30,6 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace 2.0.4 ${version}
   '';
 
-  postInstall = ''
-    wrapProgram $out/bin/obconf --prefix XDG_DATA_DIRS : ${openbox}/share/
-  '';
-
   meta = {
     description = "GUI configuration tool for openbox";
     homepage = "http://openbox.org/wiki/ObConf";

From e193ece45d579d8e4ce63f86ac0e3a96132d38a7 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 25 Aug 2022 09:49:21 +0200
Subject: [PATCH 2/2] obconf: improve code layout

---
 pkgs/tools/X11/obconf/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index 8b6e12bd378d..28b50d5c52e5 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -1,5 +1,16 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk3, openbox,
-  imlib2, libxml2, libstartup_notification, wrapGAppsHook, libSM }:
+{ lib
+, stdenv
+, fetchgit
+, autoreconfHook
+, pkg-config
+, wrapGAppsHook
+, gtk3
+, imlib2
+, libSM
+, libstartup_notification
+, libxml2
+, openbox
+}:
 
 stdenv.mkDerivation rec {
   pname = "obconf";