ryan77627/guix-dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

rotated channel commit pins and updated hyprland xdg-portal

Browse source
This commit is contained in:
Ryan Schanzenbacher 2024-02-06 23:11:12 -05:00
parent fa5aee533c
commit fa95cb0d17
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
2 changed files with 14 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
channels.scm
View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"afdbf7f271529573397474fdb8f1c9d00dceba37")
"cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
@ -14,7 +14,7 @@
(url "https://gitlab.com/nonguix/nonguix")
(branch "master")
(commit
"71a53faf2e1925a309b480f17e5b836740ce54bc")
"e4fe4809f88d91eda5a7dc29e44ee649ded7e830")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@ -25,7 +25,7 @@
(url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk")
(commit
"0d789becf6916017092f85b0d2b0a3f46e90b411")
"d29af1023320c35d3d00162f4794cc01d29c8c0c")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"

49
modules/ryan-packages/freedesktop.scm
View file

@ -44,7 +44,7 @@
(define-public xdg-desktop-portal-hyprland-ryan
(package
(name "xdg-desktop-portal-hyprland")
(version "1.2.4")
(version "1.2.6")
(source (origin
(method git-fetch)
(uri (git-reference
@ -57,48 +57,21 @@
(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 '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
(lambda* (#:key inputs outputs #:allow-other-keys)
((assoc-ref qt:%standard-phases 'build)
#:inputs inputs
#:outputs outputs
#:configure-flags '()
#: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")
"/bin")))
(install-file "build/hyprland-share-picker" share-picker)
#t)))
(add-after 'qt-install 'qt-wrap
(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 gcc-13 cmake pkg-config qtbase-5))
(inputs (list elogind hyprland hyprland-protocols slurp pipewire wayland-protocols wayland libinih mesa sdbus-c++ qtwayland-5 `(,util-linux "lib")))
(add-after `unpack `fix-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "." "\\.cp?*$")
(("/bin/sh") "sh")
(("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd)
(search-input-files inputs (string-append "/bin/" cmd)))
(("\\<(hyprctl-share-picker)\\>" _ cmd)
(string-append #$output "/bin/" cmd))))))))
(native-inputs (list gcc-13 pkg-config wayland))
(inputs (list bash-minimal grim hyprland hyprland-protocols mesa pipewire qtbase-5 sdbus-c++ slurp wayland-protocols))
(home-page "")
(synopsis "test")
(description "test")