From 07b8057a7478e1b271164c60ac6223caef2c7ad6 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Wed, 20 Mar 2024 19:20:13 +0100 Subject: [PATCH] . --- zilti/packages/hyprland.scm | 212 +++++++++++++++++++++--------------- 1 file changed, 127 insertions(+), 85 deletions(-) diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm index ed0b5c1..cddadac 100644 --- a/zilti/packages/hyprland.scm +++ b/zilti/packages/hyprland.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) #:use-module (gnu packages rust) @@ -998,26 +999,27 @@ Wayland compositor based on wlroots") (description "Hyprland.") (description "EDID and DisplayID library") (license license:expat))) + (define-public hyprlang (package - (name "hyprlang") - (version "0.5.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/hyprlang") - (commit (string-append "v" version)))) - (sha256 - (base32 - "0f8mahg6d6wylybvh6hgayls57miwwv4w69fbaskd8d7dkg2h7kd")))) - (build-system cmake-build-system) - (native-inputs - (list gcc-13)) - (home-page "https://www.hyprland.org") - (synopsis "The official implementation library for the hypr config language.") - (description "The hypr configuration language is an extremely efficient, yet easy to work with, configuration language for linux applications.") - (license license:bsd-3))) + (name "hyprlang") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprlang") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0f8mahg6d6wylybvh6hgayls57miwwv4w69fbaskd8d7dkg2h7kd")))) + (build-system cmake-build-system) + (native-inputs + (list gcc-13)) + (home-page "https://www.hyprland.org") + (synopsis "The official implementation library for the hypr config language.") + (description "The hypr configuration language is an extremely efficient, yet easy to work with, configuration language for linux applications.") + (license license:bsd-3))) (define-public hyprcursor (package @@ -1050,73 +1052,113 @@ Wayland compositor based on wlroots") (description "Hyprland.") (description "The hyprland cursor format, library and utilities.") (license license:bsd-3))) +(define-public xdg-desktop-portal-hyprland + (package + (name "xdg-desktop-portal-hyprland") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/xdg-desktop-portal-hyprland") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fdbzxanmmzrvb9wfzg1pdsnlg7dl6v5k8bl44w10n48s7bbbzn0")))) + (build-system meson-build-system) + (native-inputs + (list gcc-13 + cmake + mesa-headers-24 + pkg-config)) + (inputs + (list hyprlang + hyprland-protocols + libdrm-2.4.120 + mesa-24 + pipewire + qtbase + qttools + qtwayland + sdbus-c++ + wayland-protocols + wayland)) + (home-page "https://www.hyprland.org") + (synopsis "xdg-desktop-portal backend for hyprland") + (description "xdg-desktop-portal backend for hyprland.") + (license license:bsd-3))) + (define-public hyprland (package - (name "hyprland") - (version "0.37.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/Hyprland") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qkiyfcb3y61kwc1gqdsav87299ji7xr5j6zbh8wgam720mgivav")) - (modules '((guix build utils))) - (snippet - #~(begin - (copy-file "src/version.h.in" "src/version.h") - (substitute* "src/version.h" - (("@HASH@") #$version) - (("@BRANCH@") "") - (("@MESSAGE@") "") - (("@TAG@") "") - (("@DIRTY@") "")) - (substitute* "src/render/OpenGL.cpp" - (("/usr") "$out")))))) - (build-system meson-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure - 'pre-configure - (lambda* (#:key outputs #:allow-other-keys) - (system "patch -p1 -i nix/patches/meson-build.patch") - (system "cat src/meson.build")))))) - (native-inputs - (list gcc-13 - jq - git - mesa-headers-24 - pkg-config)) - (inputs - (list cairo-1.18.0 - egl-wayland - glu - glfw - hyprland-protocols - hyprcursor - hyprlang - libdisplay-info - libglvnd - libinput-1.25 - libxkbcommon - libdrm-2.4.120 - mesa-24 - tomlplusplus - wayland - wayland-protocols - xorg-server-xwayland - pango - pciutils - udis86 - wayland - wlroots-hyprland - xcb-util)) - (home-page "https://www.hyprland.org") - (synopsis "Dynamic tiling + (name "hyprland") + (version "0.37.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/Hyprland") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qkiyfcb3y61kwc1gqdsav87299ji7xr5j6zbh8wgam720mgivav")) + (modules '((guix build utils))) + (snippet + #~(begin + (copy-file "src/version.h.in" "src/version.h") + (substitute* "src/version.h" + (("@HASH@") #$version) + (("@BRANCH@") "") + (("@MESSAGE@") "") + (("@TAG@") "") + (("@DIRTY@") "")) + (substitute* "src/render/OpenGL.cpp" + (("/usr") "$out")))))) + (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure + 'pre-configure + (lambda* (#:key outputs #:allow-other-keys) + (system "patch -p1 -i nix/patches/meson-build.patch") + (system "cat src/meson.build")))))) + (native-inputs + (list gcc-13 + cmake + jq + git + mesa-headers-24 + pkg-config)) + (inputs + (list cairo-1.18.0 + egl-gbm + egl-wayland + glu + glfw + hyprland-protocols + hyprcursor + hyprlang + xdg-desktop-portal-hyprland + libdisplay-info + libglvnd + libinput-1.25 + libxkbcommon + libdrm-2.4.120 + mesa-24 + tomlplusplus + wayland + wayland-protocols + xorg-server-xwayland + pango + pciutils + udis86 + wayland + wlroots-hyprland + xcb-util)) + (home-page "https://www.hyprland.org") + (synopsis "Dynamic tiling Wayland compositor based on wlroots") - (description "Hyprland.") - (license license:bsd-3))) + (description "Hyprland.") + (license license:bsd-3)))