diff options
Diffstat (limited to 'modules/freya/packages/wm.scm')
| -rw-r--r-- | modules/freya/packages/wm.scm | 201 |
1 files changed, 100 insertions, 101 deletions
diff --git a/modules/freya/packages/wm.scm b/modules/freya/packages/wm.scm index 53f7738..a4daf59 100644 --- a/modules/freya/packages/wm.scm +++ b/modules/freya/packages/wm.scm @@ -39,6 +39,7 @@ #:use-module (freya packages gl) #:use-module (freya packages admin) #:use-module (freya packages cmake) + #:use-module (freya packages linux) #:use-module (freya packages freedesktop) #:use-module (freya packages assembly) #:use-module (guix utils)) @@ -249,7 +250,7 @@ for c++.") (define-public aquamarine (package (name "aquamarine") - (version "0.2.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -260,7 +261,7 @@ for c++.") (file-name (git-file-name name version)) (sha256 (base32 - "061shgk8lvbk4f35cf057hl4jh36aahd6l3si6ga91rzl184b9sh")))) + "114fspibmrwvzdmzv4xdy000vg7mn9r5vas3pr1ndb9xyl15ja1s")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) @@ -311,101 +312,99 @@ for c++.") (define-public hyprland - (let ((commit "0e86808e5912823f1c6bea1b6d5fcae297fc9f57") - (revision "1")) - (package - (name "hyprland") - (version (git-version "0.42.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/Hyprland") - (commit commit))) - (patches (list - (local-file "patches/hyprland-fix-cmake.patch"))) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file-recursively - '("hyprpm" - "subprojects")))) - (file-name (git-file-name name version)) - (sha256 - (base32 "10fiipxxkdvwxqgll5q5sa8sl5hm323gshx9bmlmlry07r0mk3mx")))) - (build-system cmake-build-system) - (arguments - (list #:tests? #f - #:build-type "release" - #:cmake cmake-minimal-3.27.0 - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "src" "\\.cpp$") - (("/usr/local(/bin/Hyprland)" _ path) - (string-append #$output path)) - (("/usr") #$output) - (("(execAndGet\\(\")\\<(cat|fc-list|lspci)\\>" - _ pre cmd) - (string-append - pre (search-input-file - inputs (string-append "bin/" cmd)))) - (("\\<cc\\>") (search-input-file inputs "bin/gcc")) - ;; NOTE: Add binutils to inputs will override ld-wrapper. - (("(execAndGet\\(\\(\")\\<nm\\>" _ pre) - (string-append pre #$binutils "/bin/nm")) - (("\\<(addr2line|objcopy)\\>" _ cmd) - (string-append #$binutils "/bin/" cmd))) - (substitute* "CMakeLists.txt" - (("libudis86") "udis86")) - )) - (add-after 'fix-path 'fix-protocols - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((protocols (string-append - (getcwd) - "/subprojects/hyprland-protocols/protocols"))) - (mkdir-p protocols) - (copy-recursively - (search-input-directory inputs "share/hyprland-protocols/protocols") - protocols)))) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (mesa (assoc-ref inputs "mesa"))) - (wrap-program (string-append out "/bin/Hyprland") - `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d"))))))) - ))) - (native-inputs - (list gcc-13 - jq - pkg-config - hyprwayland-scanner - hwdata-for-hyprland)) - (inputs - (list gcc-13 + (package + (name "hyprland") + (version "0.42.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/Hyprland") + (commit (string-append "v" version)))) + (patches (list + (local-file "patches/hyprland-fix-cmake.patch"))) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("hyprpm" + "subprojects")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hp2xafvlymikxsi6pr8iik35g46683bg376n9hkjxgh9y6njzqv")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f + #:build-type "release" + #:cmake cmake-minimal-3.27.0 + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src" "\\.cpp$") + (("/usr/local(/bin/Hyprland)" _ path) + (string-append #$output path)) + (("/usr") #$output) + (("(execAndGet\\(\")\\<(cat|fc-list|lspci)\\>" + _ pre cmd) + (string-append + pre (search-input-file + inputs (string-append "bin/" cmd)))) + (("\\<cc\\>") (search-input-file inputs "bin/gcc")) + ;; NOTE: Add binutils to inputs will override ld-wrapper. + (("(execAndGet\\(\\(\")\\<nm\\>" _ pre) + (string-append pre #$binutils "/bin/nm")) + (("\\<(addr2line|objcopy)\\>" _ cmd) + (string-append #$binutils "/bin/" cmd))) + (substitute* "CMakeLists.txt" + (("libudis86") "udis86")) + )) + (add-after 'fix-path 'fix-protocols + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((protocols (string-append + (getcwd) + "/subprojects/hyprland-protocols/protocols"))) + (mkdir-p protocols) + (copy-recursively + (search-input-directory inputs "share/hyprland-protocols/protocols") + protocols)))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (mesa (assoc-ref inputs "mesa"))) + (wrap-program (string-append out "/bin/Hyprland") + `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d"))))))) + ))) + (native-inputs + (list gcc-13 + jq + pkg-config + hyprwayland-scanner + hwdata-for-hyprland)) + (inputs + (list gcc-13 - cairo - pango - pciutils - libliftoff - udis86 + cairo + pango + pciutils + libliftoff + udis86 - aquamarine - hyprcursor - hyprland-protocols - hyprlang - hyprutils + aquamarine + hyprcursor + hyprland-protocols + hyprlang + hyprutils - xorg-server-xwayland-for-hyprland)) - (home-page "https://hyprland.org") - (synopsis "Dynamic tiling Wayland compositor based on wlroots") - (description - "Hyprland is a dynamic tiling Wayland compositor based on @code{wlroots} -that doesn't sacrifice on its looks. It supports multiple layouts, fancy -effe cts, has a very flexible IPC model allowing for a lot of customization, and -more .") - (license license:bsd-3)))) + xorg-server-xwayland-for-hyprland)) + (home-page "https://hyprland.org") + (synopsis "Dynamic tiling Wayland compositor based on wlroots") + (description + "Hyprland is a dynamic tiling Wayland compositor based on @code{wlroots} +th doesn't sacrifice on its looks. It supports multiple layouts, fancy +ef cts, has a very flexible IPC model allowing for a lot of customization, and +mo .") + (license license:bsd-3))) (define-public hyprpaper @@ -519,7 +518,7 @@ more .") (define-public xdg-desktop-portal-hyprland (package (name "xdg-desktop-portal-hyprland") - (version "1.3.1") + (version "1.3.3") (source (origin (method git-fetch) (uri (git-reference @@ -528,11 +527,10 @@ more .") (file-name (git-file-name name version)) (sha256 (base32 - "0fdbzxanmmzrvb9wfzg1pdsnlg7dl6v5k8bl44w10n48s7bbbzn0")))) - (build-system qt-build-system) + "14n4a8b91ili0kp2kjqlw3h57bsxkrjwg5bhlw2h3q93zaxv2b3k")))) + (build-system cmake-build-system) (arguments (list #:tests? #f ;No tests - #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-path @@ -554,11 +552,12 @@ more .") hyprland-protocols wayland-protocols-1.36 hyprlang - mesa - pipewire + mesa-libglvnd + pipewire-new qtwayland sdbus-c++ - slurp)) + slurp + qtbase)) (home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland") (synopsis "XDG Desktop Portal backend for Hyprland") (description |