diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm index a4e37b3..829d882 100644 --- a/zilti/packages/hyprland.scm +++ b/zilti/packages/hyprland.scm @@ -193,77 +193,6 @@ command line tool called @code{udcli} that incorporates the library.") (sha256 (base32 "00i7c98ignfgkk3x1r1masmlj92xzb8cdb7nyfhivbfkdlfyzgpj")))) -#; -(define-public hyprland - (package - (name "hyprland") - (version "0.38.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/hyprwm/Hyprland" - "/releases/download/v" version - "/source-v" version ".tar.gz")) - (modules '((guix build utils))) - (patches (list hyprland-unbundle-wlroots-patch)) - (sha256 - (base32 - "1avkzdcgyk65p44nwl9w8sv4iq5xs13i7i66jsya9z06q1f3d1hs")))) - (build-system gnu-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (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)))) - (("\\") (search-input-file inputs "bin/gcc")) - ;; NOTE: Add binutils to inputs will override ld-wrapper. - (("(execAndGet\\(\\(\")\\" _ pre) - (string-append pre #$binutils "/bin/nm")) - (("\\<(addr2line|objcopy)\\>" _ cmd) - (string-append #$binutils "/bin/" cmd))))) - (replace 'build - (lambda _ - (invoke "sed" "-i" "s/no-warn-unused-cli/no-warn-unused-cli -DNO_SYSTEMD=1/" "Makefile") - (invoke "make" - (string-append "PREFIX=" #$output) - "all"))) - (add-after 'build 'install-headers - (lambda _ - (invoke "make" - (string-append "PREFIX=" #$output) - "installheaders")))))) - (native-inputs (list cmake ninja meson gcc-13 jq pkg-config cpio)) - (inputs - (list cairo-for-hyprland - python-wrapper - libglvnd - gcc-13 - rosenthal:hyprcursor - rosenthal:hyprland-protocols - rosenthal:hyprlang - pango - pciutils - tomlplusplus - udis86-for-hyprland - wlroots-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 -effects, has a very flexible IPC model allowing for a lot of customization, and -more.") - (license license:bsd-3))) - (define-public hyprland (package (name "hyprland") @@ -335,6 +264,38 @@ effects, has a very flexible IPC model allowing for a lot of customization, and more.") (license license:bsd-3))) +(define-public hyprland-split-monitor-workspaces + (package + (name "hyprland-split-monitor-workspaces") + (version "d0012b8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Duckonaut/split-monitor-workspaces.git") + (commit version))) + (sha256 + (base32 + "0651nvj9a9hccb699akfpv6p3s886pajmafs05c2va4bxwnhp9yy")))) + (build-system gnu-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + (list gcc-13 + pkg-config + hyprland + cairo-for-hyprland + libdrm-for-hyprland + rosenthal:hyprlang + pixman + wlroots-for-hyprland + jq)) + (home-page "https://github.com/Duckonaut/split-monitor-workspaces.git") + (synopsis "A small Hyprland plugin to provide awesome-like workspace behavior") + (description "A small plugin to provide awesome/dwm-like behavior with workspaces: split them between monitors and provide independent numbering.") + (license license:bsd-3))) + (define-public hyprpaper (package (name "hyprpaper")