Some prelim changes, THIS BRANCH DOES NOT WORK

1 files changed, 23 insertions, 5 deletions

diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm
index e5db0af..7cb9e8e 100644
--- a/modules/ryan-packages/freedesktop.scm
+++ b/modules/ryan-packages/freedesktop.scm
@@ -49,15 +49,33 @@
     (build-system meson-build-system)
     (arguments
       (list
+        #:modules
+        '((guix build utils)
+          (guix build meson-build-system)
+          ((guix build qt-build-system) #:prefix qt:))
+        #:imported-modules
+        (append %meson-build-system-modules
+                %qt-build-system-modules)
         #:tests? #f
         #:configure-flags #~(list "-Dsystemd=disabled")
         #:phases
+        ;; After building the portal, we need to build the share selector using qt
         #~(modify-phases %standard-phases
-            (add-after 'build 'chdir-and-build
-              (lambda _ (chdir "../source/hyprland-share-picker/")
-                        (invoke "make")))
-            (add-after 'install 'install-picker
-              (lambda _ (install-file "hyprland-share-picker" (string-append #$output "/bin")))))))
+            (add-after 'install 'chdir
+              (lambda _ (chdir "../source/hyprland-share-picker/")))
+            (add-after 'chdir 'check-setup
+              (assoc-ref qt:%standard-phases 'check-setup))
+            (add-after 'check-setup 'qt-build-new
+              (lambda* (#:key inputs outputs #:allow-other-keys)
+                ((assoc-ref qt:%standard-phases 'build)
+                 #:inputs inputs
+                 #:outputs outputs
+                 #:configure-flags '()
+                 #:qtbase (let ((module (resolve-interface '(gnu packages qt))))(module-ref module 'qtbase)))))
+            (add-after 'qt-build 'qt-install
+             (assoc-ref qt:%standard-phases 'install))
+            (add-after 'qt-install 'qt-wrap
+              (assoc-ref qt:%standard-phases 'qt-wrap)))))
     (native-inputs (list cmake pkg-config))
     (inputs (list elogind hyprland hyprland-protocols pipewire wayland-protocols wayland libinih mesa qtwayland `(,util-linux "lib")))
     (home-page "")