ugh

2 files changed, 19 insertions, 3 deletions

diff --git a/modules/ryan-packages/gtk.scm b/modules/ryan-packages/gtk.scm
new file mode 100644
index 0000000..6548c7d
--- /dev/null
+++ b/modules/ryan-packages/gtk.scm
@@ -0,0 +1,17 @@
+(define-module (ryan-packages gtk)
+               #:use-module (guix packages)
+               #:use-module (gnu packages)
+               #:use-module (gnu packages glib)
+               #:use-module (gnu packages gtk))
+
+(define-public pangomm-ryan
+  (package
+    (inherit pangomm-2.46)
+    (propagated-inputs (modify-inputs (package-propagated-inputs pangomm-2.46) (replace "glibmm-2.64" glibmm)))))
+
+(define-public gtkmm-ryan
+  (package
+    (inherit gtkmm-3)
+    (propagated-inputs (modify-inputs (package-propagated-inputs gtkmm-3) (delete "pangomm-2.46") (prepend pangomm-ryan)))))
+
+gtkmm-ryan
diff --git a/modules/ryan-packages/wm.scm b/modules/ryan-packages/wm.scm
index 05441ea..b600bd3 100644
--- a/modules/ryan-packages/wm.scm
+++ b/modules/ryan-packages/wm.scm
@@ -7,6 +7,7 @@
                #:use-module (gnu packages audio)
                #:use-module (gnu packages glib)
                #:use-module (gnu packages gtk)
+               #:use-module (ryan-packages gtk)
                #:use-module (gnu packages llvm)
                #:use-module (gnu packages gcc)
                #:use-module (gnu packages check)
@@ -44,9 +45,7 @@
         (base32 "0flwxg9rd7a2ygjvyksxxhxyyhp760jzd5ngkx65y77bxh1l7cpl"))))
     (arguments
       (list
-        #:tests? #f
         #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))
-    (native-inputs (modify-inputs (package-native-inputs waybar) (prepend clang)))
-    (inputs (modify-inputs (package-inputs waybar) (delete "gtkmm-3"))))) ;(prepend python cava catch2 gtkmm)))))
+    (inputs (modify-inputs (package-inputs waybar) (delete "gtkmm-3") (prepend gtkmm-ryan))))) ;(prepend python cava catch2 gtkmm)))))
 
 waybar-new