Compare commits

...

3 commits

3 changed files with 25 additions and 11 deletions

View file

@ -204,6 +204,8 @@ windowrulev2 = size 578 326, class:^(firefox)$, title:^(Picture-in-Picture)$
windowrulev2 = float, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$
windowrulev2 = size 56 31, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$
windowrulev2 = move 50% 0, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$
#windowrulev2 = nomaximizerequest, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$
#windowrulev2 = nofullscreenrequest, class:^(firefox)$, title:^(Firefox — Sharing Indicator)$
# Weather
windowrulev2 = float,class:^(ala-wttr)$

View file

@ -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

View file

@ -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)
@ -36,7 +37,7 @@
(define-public xdg-desktop-portal-hyprland
(package
(name "xdg-desktop-portal-hyprland")
(version "0.4.0")
(version "0.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -45,7 +46,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"1dcglmx02j73qbmw9qsacamn8byakyzwknpqjnhsyphixb4crrdg"))))
"1dmgc0w4wjj9hwqg17wg529v8sbxr6czp9s319d5407jm780x40b"))))
(build-system meson-build-system)
(arguments
(list
@ -65,21 +66,32 @@
(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
(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 (let ((module (resolve-interface '(gnu packages qt))))(module-ref module 'qtbase))))) <--- This results in no code for module (gnu packages qt)
#:qtbase #$(this-package-native-input "qtbase"))))
;)))
#:qtbase #$(this-package-native-input "qtbase-5"))))
(add-after 'qt-build 'qt-install
(assoc-ref qt:%standard-phases '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)))))
(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")