summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Schanzenbacher <ryan@rschanz.org>2024-02-06 23:11:12 -0500
committerRyan Schanzenbacher <ryan@rschanz.org>2024-02-06 23:11:12 -0500
commitfa95cb0d17d8c745e12108e7a76c9d9923035722 (patch)
treee500c37e936098076698ef5b3684f2701f498ecc
parentfa5aee533c50ccbdab96c1d27fe71edf074a7c68 (diff)
rotated channel commit pins and updated hyprland xdg-portal
-rw-r--r--channels.scm6
-rw-r--r--modules/ryan-packages/freedesktop.scm49
2 files changed, 14 insertions, 41 deletions
diff --git a/channels.scm b/channels.scm
index c79b138..003443e 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
3 (url "https://git.savannah.gnu.org/git/guix.git") 3 (url "https://git.savannah.gnu.org/git/guix.git")
4 (branch "master") 4 (branch "master")
5 (commit 5 (commit
6 "afdbf7f271529573397474fdb8f1c9d00dceba37") 6 "cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d")
7 (introduction 7 (introduction
8 (make-channel-introduction 8 (make-channel-introduction
9 "9edb3f66fd807b096b48283debdcddccfea34bad" 9 "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
14 (url "https://gitlab.com/nonguix/nonguix") 14 (url "https://gitlab.com/nonguix/nonguix")
15 (branch "master") 15 (branch "master")
16 (commit 16 (commit
17 "71a53faf2e1925a309b480f17e5b836740ce54bc") 17 "e4fe4809f88d91eda5a7dc29e44ee649ded7e830")
18 (introduction 18 (introduction
19 (make-channel-introduction 19 (make-channel-introduction
20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc" 20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,7 +25,7 @@
25 (url "https://codeberg.org/hako/rosenthal.git") 25 (url "https://codeberg.org/hako/rosenthal.git")
26 (branch "trunk") 26 (branch "trunk")
27 (commit 27 (commit
28 "0d789becf6916017092f85b0d2b0a3f46e90b411") 28 "d29af1023320c35d3d00162f4794cc01d29c8c0c")
29 (introduction 29 (introduction
30 (make-channel-introduction 30 (make-channel-introduction
31 "7677db76330121a901604dfbad19077893865f35" 31 "7677db76330121a901604dfbad19077893865f35"
diff --git a/modules/ryan-packages/freedesktop.scm b/modules/ryan-packages/freedesktop.scm
index 1dd5d0d..0deb449 100644
--- a/modules/ryan-packages/freedesktop.scm
+++ b/modules/ryan-packages/freedesktop.scm
@@ -44,7 +44,7 @@
44(define-public xdg-desktop-portal-hyprland-ryan 44(define-public xdg-desktop-portal-hyprland-ryan
45 (package 45 (package
46 (name "xdg-desktop-portal-hyprland") 46 (name "xdg-desktop-portal-hyprland")
47 (version "1.2.4") 47 (version "1.2.6")
48 (source (origin 48 (source (origin
49 (method git-fetch) 49 (method git-fetch)
50 (uri (git-reference 50 (uri (git-reference
@@ -57,48 +57,21 @@
57 (build-system meson-build-system) 57 (build-system meson-build-system)
58 (arguments 58 (arguments
59 (list 59 (list
60 #:modules
61 '((guix build utils)
62 (guix build meson-build-system)
63 ((guix build qt-build-system) #:prefix qt:))
64 #:imported-modules
65 (append %meson-build-system-modules
66 %qt-build-system-modules)
67 #:tests? #f 60 #:tests? #f
68 #:configure-flags #~(list "-Dsystemd=disabled") 61 #:configure-flags #~(list "-Dsystemd=disabled")
69 #:phases 62 #:phases
70 ;; After building the portal, we need to build the share selector using qt 63 ;; After building the portal, we need to build the share selector using qt
71 #~(modify-phases %standard-phases 64 #~(modify-phases %standard-phases
72 (add-after 'install 'chdir 65 (add-after `unpack `fix-path
73 (lambda _ (chdir "../source/hyprland-share-picker/"))) 66 (lambda* (#:key inputs #:allow-other-keys)
74 (add-after 'chdir 'check-setup 67 (substitute* (find-files "." "\\.cp?*$")
75 (assoc-ref qt:%standard-phases 'check-setup)) 68 (("/bin/sh") "sh")
76 (add-after 'check-setup 'qt-build 69 (("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd)
77 (lambda* (#:key inputs outputs #:allow-other-keys) 70 (search-input-files inputs (string-append "/bin/" cmd)))
78 ((assoc-ref qt:%standard-phases 'build) 71 (("\\<(hyprctl-share-picker)\\>" _ cmd)
79 #:inputs inputs 72 (string-append #$output "/bin/" cmd))))))))
80 #:outputs outputs 73 (native-inputs (list gcc-13 pkg-config wayland))
81 #:configure-flags '() 74 (inputs (list bash-minimal grim hyprland hyprland-protocols mesa pipewire qtbase-5 sdbus-c++ slurp wayland-protocols))
82 #:qtbase #$(this-package-native-input "qtbase-5"))))
83 (add-after 'qt-build 'qt-install
84 (lambda* (#:key inputs outputs #:allow-other-keys)
85 (let ((share-picker (string-append (assoc-ref outputs "out")
86 "/bin")))
87 (install-file "build/hyprland-share-picker" share-picker)
88 #t)))
89 (add-after 'qt-install 'qt-wrap
90 (assoc-ref qt:%standard-phases 'qt-wrap))
91 (add-after 'qt-wrap 'dep-wrap
92 (lambda* (#:key inputs #:allow-other-keys)
93 (let ((hyprland-share-picker (string-append #$output "/bin/hyprland-share-picker")))
94 (wrap-program hyprland-share-picker
95 `("PATH" suffix
96 ,(map (lambda (program)
97 (dirname (search-input-file
98 inputs (string-append "/bin/" program))))
99 '("slurp"))))))))))
100 (native-inputs (list gcc-13 cmake pkg-config qtbase-5))
101 (inputs (list elogind hyprland hyprland-protocols slurp pipewire wayland-protocols wayland libinih mesa sdbus-c++ qtwayland-5 `(,util-linux "lib")))
102 (home-page "") 75 (home-page "")
103 (synopsis "test") 76 (synopsis "test")
104 (description "test") 77 (description "test")