success... i think

2 files changed, 15 insertions, 5 deletions

diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 9273e17..f0c8e03 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -141,7 +141,7 @@
                                                           "wireplumber"
                                                           "wireshark"
                                                           "zsh"))
-                           (list my-ca-certs swaylock-effects-new waybar-new xdg-desktop-portal-hyprland hyprland-share-picker)
+                           (list my-ca-certs swaylock-effects-new waybar-new xdg-desktop-portal-hyprland)
                            %my-base-packages ))
 
     ;; Below is the list of system services.  To search for available
diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm
index 1ab446b..6e13d53 100644
--- a/modules/ryan-packages/freedesktop.scm
+++ b/modules/ryan-packages/freedesktop.scm
@@ -10,6 +10,7 @@
                 #:use-module (gnu packages)
                 #:use-module (gnu packages gl)
                 #:use-module (gnu packages linux)
+                #:use-module (gnu packages image)
                 #:use-module (gnu packages qt)
                 #:use-module (gnu packages cmake)
                 #:use-module (gnu packages pkg-config)
@@ -71,7 +72,7 @@
                  #:inputs inputs
                  #:outputs outputs
                  #:configure-flags '()
-                 #:qtbase #$(this-package-native-input "qtbase"))))
+                 #:qtbase #$(this-package-native-input "qtbase-5"))))
             (add-after 'qt-build 'qt-install
               (lambda* (#:key inputs outputs #:allow-other-keys)
                 (let ((share-picker (string-append (assoc-ref outputs "out")
@@ -79,9 +80,18 @@
                   (install-file "build/hyprland-share-picker" share-picker)
                   #t)))
             (add-after 'qt-install 'qt-wrap
-              (assoc-ref qt:%standard-phases 'qt-wrap)))))
-    (native-inputs (list cmake pkg-config qtbase))
-    (inputs (list elogind hyprland hyprland-protocols pipewire wayland-protocols wayland libinih mesa qtwayland `(,util-linux "lib")))
+              (assoc-ref qt:%standard-phases 'qt-wrap))
+            (add-after 'qt-wrap 'dep-wrap
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((hyprland-share-picker (string-append #$output "/bin/hyprland-share-picker")))
+                  (wrap-program hyprland-share-picker
+                    `("PATH" suffix
+                      ,(map (lambda (program)
+                              (dirname (search-input-file
+                                        inputs (string-append "/bin/" program))))
+                            '("slurp"))))))))))
+    (native-inputs (list cmake pkg-config qtbase-5))
+    (inputs (list elogind hyprland hyprland-protocols slurp pipewire wayland-protocols wayland libinih mesa qtwayland-5 `(,util-linux "lib")))
     (home-page "")
     (synopsis "test")
     (description "test")