From ada2a99fe56a80dcdb913b8e90293825387934c6 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Wed, 11 Oct 2023 23:45:39 -0400 Subject: WAYBAR FIXED. LETS FUCKING GOOOOO --- modules/ryan-packages/gtk.scm | 27 +++++++++++++++++++++------ modules/ryan-packages/wm.scm | 6 +++--- 2 files changed, 24 insertions(+), 9 deletions(-) (limited to 'modules/ryan-packages') diff --git a/modules/ryan-packages/gtk.scm b/modules/ryan-packages/gtk.scm index b972342..3407803 100644 --- a/modules/ryan-packages/gtk.scm +++ b/modules/ryan-packages/gtk.scm @@ -1,30 +1,45 @@ (define-module (ryan-packages gtk) #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages glib) #:use-module (gnu packages cmake) #:use-module (gnu packages gtk)) +(define-public glibmm-2.66 + (package + (inherit glibmm-2.64) + (name "glibmm") + (version "2.66.5") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 "0jf1drbb585lcyvh45krkbcjpnq5mwr1scvh0mnbihvfvmi4cf3v")))))) + (define-public pangomm-ryan (package (inherit pangomm-2.46) - (propagated-inputs (modify-inputs (package-propagated-inputs pangomm-2.46) (delete "glibmm"))) - (native-inputs (modify-inputs (package-native-inputs pangomm-2.46) (prepend glibmm-2.64))))) + (propagated-inputs (modify-inputs (package-propagated-inputs pangomm-2.46) (replace "glibmm" glibmm-2.66))))) (define-public atkmm-ryan (package (inherit atkmm-2.28) - (propagated-inputs (modify-inputs (package-propagated-inputs atkmm-2.28) (replace "glibmm" glibmm))))) + (propagated-inputs (modify-inputs (package-propagated-inputs atkmm-2.28) (replace "glibmm" glibmm-2.66))))) (define-public cairomm-ryan (package (inherit cairomm-1.14) - (propagated-inputs (modify-inputs (package-propagated-inputs cairomm-1.14) (replace "glibmm" glibmm))))) + (propagated-inputs (modify-inputs (package-propagated-inputs cairomm-1.14) (replace "glibmm" glibmm-2.66))))) (define-public gtkmm-ryan (package (inherit gtkmm-3) - (propagated-inputs (list gtk+ glibmm cairomm-ryan)) - (native-inputs (modify-inputs (package-native-inputs gtkmm-3) (prepend cmake atkmm-2.28 pangomm-2.46))))) + (propagated-inputs (list gtk+ glibmm cairomm-1.14 atkmm-ryan pangomm-ryan)))) gtkmm-ryan diff --git a/modules/ryan-packages/wm.scm b/modules/ryan-packages/wm.scm index d433845..47ba9b2 100644 --- a/modules/ryan-packages/wm.scm +++ b/modules/ryan-packages/wm.scm @@ -6,7 +6,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages audio) #:use-module (gnu packages glib) -; #:use-module (gnu packages gtk) + #:use-module (gnu packages gtk) #:use-module (gnu packages llvm) #:use-module (gnu packages gcc) #:use-module (gnu packages check) @@ -46,6 +46,6 @@ (arguments (list #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true"))) - (inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))) ;(prepend python cava catch2 gtkmm))))) - (native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13))))) + (inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))))) ;(prepend python cava catch2 gtkmm))))) + ;(native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13))))) waybar-new -- cgit v1.2.3