mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2025-05-04 03:35:02 +00:00
rosenthal: xdg-desktop-portal-hyprland: Update to 1.2.5.
* rosenthal/packages/wm.scm (xdg-desktop-portal-hyprland): Update to 1.2.5. [arguments]<#:phases>: Adjust 'fix-path. Remove QT Build System related phases. <#:imported-modules,#:modules>: Remove arguments. [native-inputs]: Add gcc-13, wayland. Remove cmake-minimal. [inputs]: Add hyprland, sdbus-c++. Remove basu, libinih, util-linux:lib, wayland.
This commit is contained in:
parent
9ca1896dc9
commit
befe81a423
@ -6,7 +6,6 @@
|
|||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system meson)
|
#:use-module (guix build-system meson)
|
||||||
#:use-module (guix build-system qt)
|
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
@ -14,10 +13,10 @@
|
|||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages cmake)
|
|
||||||
#:use-module (gnu packages freedesktop)
|
#:use-module (gnu packages freedesktop)
|
||||||
#:use-module (gnu packages gcc)
|
#:use-module (gnu packages gcc)
|
||||||
#:use-module (gnu packages gl)
|
#:use-module (gnu packages gl)
|
||||||
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages gnome)
|
#:use-module (gnu packages gnome)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
@ -250,7 +249,7 @@ more.")
|
|||||||
(define-public xdg-desktop-portal-hyprland
|
(define-public xdg-desktop-portal-hyprland
|
||||||
(package
|
(package
|
||||||
(name "xdg-desktop-portal-hyprland")
|
(name "xdg-desktop-portal-hyprland")
|
||||||
(version "0.5.0")
|
(version "1.2.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@ -259,57 +258,32 @@ more.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1dmgc0w4wjj9hwqg17wg529v8sbxr6czp9s319d5407jm780x40b"))))
|
"1cfrqirvpxnj6dapm8q30vx040nzg4f9g622s5pdiv684yd3z2jz"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:imported-modules
|
(list #:tests? #f ;No tests
|
||||||
(append %meson-build-system-modules
|
|
||||||
%qt-build-system-modules)
|
|
||||||
#:modules
|
|
||||||
'((guix build utils)
|
|
||||||
(guix build meson-build-system)
|
|
||||||
((guix build qt-build-system) #:prefix qt:))
|
|
||||||
#:tests? #f ;No tests
|
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'fix-path
|
(add-after 'unpack 'fix-path
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(substitute* (find-files "." "\\.cp?*$")
|
(substitute* (find-files "." "\\.cp?*$")
|
||||||
(("/bin/sh") "sh")
|
(("/bin/sh") "sh")
|
||||||
(("\\<(sh|grim|slurp)\\>" _ cmd)
|
(("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd)
|
||||||
(search-input-file inputs (string-append "/bin/" cmd)))
|
(search-input-file inputs (string-append "/bin/" cmd)))
|
||||||
(("\"(hyprland-share-picker)\"" _ cmd)
|
(("\\<(hyprland-share-picker)\\>" _ cmd)
|
||||||
(string-append "\"" #$output "/bin/" cmd "\"")))))
|
(string-append #$output "/bin/" cmd))))))))
|
||||||
;; After building the portal, we need to build the share selector
|
(native-inputs
|
||||||
;; using qt
|
(list gcc-13 pkg-config wayland))
|
||||||
(add-after 'install 'chdir
|
|
||||||
(lambda _
|
|
||||||
(chdir "../source/hyprland-share-picker/")))
|
|
||||||
(add-after 'chdir 'qt-build
|
|
||||||
(lambda* (#:key (make-flags '()) (parallel-build? #t)
|
|
||||||
#:allow-other-keys)
|
|
||||||
((assoc-ref qt:%standard-phases 'build)
|
|
||||||
#:make-flags make-flags
|
|
||||||
#:parallel-build? parallel-build?)))
|
|
||||||
(add-after 'qt-build 'install-hyprland-share-picker
|
|
||||||
(lambda _
|
|
||||||
(install-file "build/hyprland-share-picker"
|
|
||||||
(string-append #$output "/bin"))))
|
|
||||||
(add-after 'install-hyprland-share-picker 'qt-wrap
|
|
||||||
(assoc-ref qt:%standard-phases 'qt-wrap)))))
|
|
||||||
(native-inputs (list cmake-minimal pkg-config))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list bash-minimal
|
(list bash-minimal
|
||||||
basu
|
|
||||||
grim
|
grim
|
||||||
|
hyprland
|
||||||
hyprland-protocols
|
hyprland-protocols
|
||||||
libinih
|
|
||||||
mesa
|
mesa
|
||||||
pipewire
|
pipewire
|
||||||
qtbase-5
|
qtbase-5
|
||||||
|
sdbus-c++
|
||||||
slurp
|
slurp
|
||||||
`(,util-linux "lib")
|
|
||||||
wayland
|
|
||||||
wayland-protocols))
|
wayland-protocols))
|
||||||
(home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland")
|
(home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland")
|
||||||
(synopsis "XDG Desktop Portal backend for Hyprland")
|
(synopsis "XDG Desktop Portal backend for Hyprland")
|
||||||
|
Loading…
Reference in New Issue
Block a user