zilti
/
guixchannel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

This commit is contained in:
Daniel Ziltener 2024-04-16 01:04:37 +02:00
parent e6db930101
commit 35ccb639b8
Signed by: zilti
GPG Key ID: B38976E82C9DAE42
3 changed files with 416 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

651
zilti/packages/hyprland.scm
View File

@ -1,70 +1,132 @@
(define-module (zilti packages hyprland) (define-module
#:use-module (srfi srfi-1) (zilti packages hyprland)
#:use-module (ice-9 match) #:use-module
#:use-module (guix packages) (srfi srfi-1)
#:use-module (guix download) #:use-module
#:use-module (guix gexp) (ice-9 match)
#:use-module (guix utils) #:use-module
#:use-module (guix build-system meson) (guix packages)
#:use-module (guix build-system cmake) #:use-module
#:use-module (guix build-system gnu) (guix download)
#:use-module (guix build-system qt) #:use-module
#:use-module ((guix licenses) #:prefix license:) (guix gexp)
#:use-module (guix git-download) #:use-module
#:use-module (gnu packages) (guix build utils)
#:use-module (rosenthal packages freedesktop) #:use-module
#:use-module ((rosenthal packages wm) #:prefix rosenthal:) (guix utils)
#:use-module (gnu packages admin) #:use-module
#:use-module (gnu packages autotools) (guix build-system meson)
#:use-module (gnu packages base) #:use-module
#:use-module (gnu packages bash) (guix build-system cmake)
#:use-module (gnu packages bison) #:use-module
#:use-module (gnu packages build-tools) (guix build-system gnu)
#:use-module (gnu packages check) #:use-module
#:use-module (gnu packages compression) (guix build-system qt)
#:use-module (gnu packages cpio) #:use-module
#:use-module (gnu packages docbook) ((guix licenses)
#:use-module (gnu packages elf) #:prefix license:)
#:use-module (gnu packages file) #:use-module
#:use-module (gnu packages flex) (guix git-download)
#:use-module (gnu packages fontutils) #:use-module
#:use-module (gnu packages freedesktop) (gnu packages)
#:use-module (gnu packages gcc) #:use-module
#:use-module (gnu packages gettext) (rosenthal packages freedesktop)
#:use-module (gnu packages ghostscript) #:use-module
#:use-module (gnu packages gl) ((rosenthal packages wm)
#:use-module (gnu packages glib) #:prefix rosenthal:)
#:use-module (gnu packages gnome) #:use-module
#:use-module (gnu packages gtk) (gnu packages admin)
#:use-module (gnu packages hardware) #:use-module
#:use-module (gnu packages image) (gnu packages autotools)
#:use-module (gnu packages linux) #:use-module
#:use-module (gnu packages ninja) (gnu packages base)
#:use-module (gnu packages pciutils) #:use-module
#:use-module (gnu packages pkg-config) (gnu packages bash)
#:use-module (gnu packages python) #:use-module
#:use-module (gnu packages qt) (gnu packages bison)
#:use-module (gnu packages version-control) #:use-module
#:use-module (gnu packages xdisorg) (gnu packages build-tools)
#:use-module (gnu packages vulkan) #:use-module
#:use-module (gnu packages web) (gnu packages check)
#:use-module (gnu packages xml) #:use-module
#:use-module (gnu packages wm) (gnu packages compression)
#:use-module (gnu packages xorg) #:use-module
#:use-module ((zilti packages utilities) #:prefix utils:)) (gnu packages cpio)
#:use-module
(gnu packages docbook)
#:use-module
(gnu packages elf)
#:use-module
(gnu packages file)
#:use-module
(gnu packages flex)
#:use-module
(gnu packages fontutils)
#:use-module
(gnu packages freedesktop)
#:use-module
(gnu packages gcc)
#:use-module
(gnu packages gettext)
#:use-module
(gnu packages ghostscript)
#:use-module
(gnu packages gl)
#:use-module
(gnu packages glib)
#:use-module
(gnu packages gnome)
#:use-module
(gnu packages gtk)
#:use-module
(gnu packages hardware)
#:use-module
(gnu packages image)
#:use-module
(gnu packages linux)
#:use-module
(gnu packages ninja)
#:use-module
(gnu packages pciutils)
#:use-module
(gnu packages pkg-config)
#:use-module
(gnu packages python)
#:use-module
(gnu packages qt)
#:use-module
(gnu packages version-control)
#:use-module
(gnu packages xdisorg)
#:use-module
(gnu packages vulkan)
#:use-module
(gnu packages web)
#:use-module
(gnu packages xml)
#:use-module
(gnu packages wm)
#:use-module
(gnu packages xorg)
#:use-module
((zilti packages utilities)
#:prefix utils:))
(define-public tomlplusplus ;; SENT to Guix (define-public tomlplusplus ;; SENT to Guix
(package (package
(name "tomlplusplus") (name "tomlplusplus")
(version "3.4.0") (version "3.4.0")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/marzer/tomlplusplus") (uri
(commit (string-append "v" version)))) (git-reference
(sha256 (url "https://github.com/marzer/tomlplusplus")
(base32 (commit
"1hvbifzcc97r9jwjzpnq31ynqnj5y93cjz4frmgddnkg8hxmp6w7")))) (string-append "v" version))))
(sha256
(base32
"1hvbifzcc97r9jwjzpnq31ynqnj5y93cjz4frmgddnkg8hxmp6w7"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list python utils:cmake)) (list python utils:cmake))
@ -77,178 +139,174 @@
(define-public libliftoff (define-public libliftoff
(package (package
(name "libliftoff") (name "libliftoff")
(version "0.4.1") (version "0.4.1")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://gitlab.freedesktop.org/emersion/libliftoff") (uri
(commit (string-append "v" version)))) (git-reference
(sha256 (url "https://gitlab.freedesktop.org/emersion/libliftoff")
(base32 (commit
"1ikjp638d655ycaqkdnzhb12d29kkbb3a46lqhbhsfc8vsqj3z1l")))) (string-append "v" version))))
(build-system meson-build-system) (sha256
(native-inputs (base32
(list utils:cmake "1ikjp638d655ycaqkdnzhb12d29kkbb3a46lqhbhsfc8vsqj3z1l"))))
pkg-config)) (build-system meson-build-system)
(inputs (native-inputs
(list libdrm)) (list utils:cmake
(home-page "https://gitlab.freedesktop.org/emersion/libliftoff/") pkg-config))
(synopsis "Lightweight KMS plane library.") (inputs
(description "libliftoff eases the use of KMS planes from userspace without standing in your (list libdrm))
(home-page "https://gitlab.freedesktop.org/emersion/libliftoff/")
(synopsis "Lightweight KMS plane library.")
(description "libliftoff eases the use of KMS planes from userspace without standing in your
way. Users create \"virtual planes\" called layers, set KMS properties on them, way. Users create \"virtual planes\" called layers, set KMS properties on them,
and libliftoff will pick hardware planes for these layers if possible.") and libliftoff will pick hardware planes for these layers if possible.")
(license license:expat))) (license license:expat)))
(define cairo-for-hyprland (define cairo-for-hyprland
(package (package
(inherit cairo) (inherit cairo)
(name "cairo") (name "cairo")
(version "1.18.0") (version "1.18.0")
(source (origin (source
(method url-fetch) (origin
(uri (string-append "https://cairographics.org/releases/cairo-" (method url-fetch)
version ".tar.xz")) (uri
(sha256 (string-append "https://cairographics.org/releases/cairo-"
(base32 version ".tar.xz"))
"0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4")))) (sha256
(build-system meson-build-system) (base32
(arguments "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
(list #:tests? #f (build-system meson-build-system)
#:glib-or-gtk? #t (arguments
#:configure-flags (list #:tests? #f
#~(list "-Dspectre=disabled"))) #:glib-or-gtk? #t
(outputs '("out")))) #:configure-flags
#~(list "-Dspectre=disabled")))
(outputs
'("out"))))
(define hwdata-for-hyprland (define hwdata-for-hyprland
(package (package
(inherit hwdata) (inherit hwdata)
(arguments (arguments
(substitute-keyword-arguments (package-arguments hwdata) (substitute-keyword-arguments
((#:phases _) #~%standard-phases))) (package-arguments hwdata)
(outputs '("out")))) ((#:phases _)
#~%standard-phases)))
(outputs
'("out"))))
(define wayland-protocols-for-hyprland (define wayland-protocols-for-hyprland
(package (package
(inherit wayland-protocols) (inherit wayland-protocols)
(name "wayland-protocols") (name "wayland-protocols")
(version "1.34") (version "1.34")
(source (origin (source
(method url-fetch) (origin
(uri (string-append (method url-fetch)
"https://gitlab.freedesktop.org/wayland/wayland-protocols" (uri
"/-/releases/" version "/downloads/" (string-append
"wayland-protocols-" version ".tar.xz")) "https://gitlab.freedesktop.org/wayland/wayland-protocols"
(sha256 "/-/releases/" version "/downloads/"
(base32 "wayland-protocols-" version ".tar.xz"))
"1sxgvis0abkymc02nhx2svm60myiq3shvy759sphpxl5rp52g6y5")))))) (sha256
(base32
(define-public wlroots-hyprland "1sxgvis0abkymc02nhx2svm60myiq3shvy759sphpxl5rp52g6y5"))))))
(let ((base wlroots)
(revision "255")
(commit "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"))
(package
(inherit base)
(name "wlroots")
(version (git-version "0.19.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.freedesktop.org/wlroots/wlroots.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"0bwpppb86nfjg2lw62y449f9iz2v8djqb8n6g1cn45vqnwj8hxf1"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs wlroots)
(prepend libdrm-for-hyprland)
(prepend xcb-util-renderutil)
(replace "libinput-minimal" libinput-minimal-1.24.0)
(replace "wayland-protocols" wayland-protocols-for-hyprland)))
(native-inputs
(modify-inputs (package-native-inputs base)
(replace "hwdata" `(,hwdata-for-hyprland "out")))))))
(define libdrm-for-hyprland (define libdrm-for-hyprland
(package (package
(inherit libdrm) (inherit libdrm)
(name "libdrm") (name "libdrm")
(version "2.4.120") (version "2.4.120")
(source (origin (source
(method url-fetch) (origin
(uri (string-append (method url-fetch)
"https://dri.freedesktop.org/libdrm/libdrm-" (uri
version ".tar.xz")) (string-append
(sha256 "https://dri.freedesktop.org/libdrm/libdrm-"
(base32 version ".tar.xz"))
"0yijzgg6rdsa68bz03sw0lcfa2nclv9m3as1cja50wkcyxim7x9v")))))) (sha256
(base32
"0yijzgg6rdsa68bz03sw0lcfa2nclv9m3as1cja50wkcyxim7x9v"))))))
(define-public hyprcursor (define-public hyprcursor
(package (package
(inherit rosenthal:hyprcursor) (inherit rosenthal:hyprcursor)
(name "hyprcursor") (name "hyprcursor")
(version "0.1.7") (version "0.1.7")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/hyprwm/hyprcursor.git") (uri
(commit (string-append "v" version)))) (git-reference
(sha256 (url "https://github.com/hyprwm/hyprcursor.git")
(base32 (commit
"0s5x3nk2f48xl2z797f8s5jddmhpkg0ndw0jl7mirv9l23xmajag")))) (string-append "v" version))))
(sha256
(base32
"0s5x3nk2f48xl2z797f8s5jddmhpkg0ndw0jl7mirv9l23xmajag"))))
(inputs (inputs
(modify-inputs (package-inputs rosenthal:hyprcursor) (modify-inputs
(append tomlplusplus))))) (package-inputs rosenthal:hyprcursor)
(append tomlplusplus)))))
(define-public hyprlang (define-public hyprlang
(package (package
(inherit rosenthal:hyprlang) (inherit rosenthal:hyprlang)
(name "hyprlang") (name "hyprlang")
(version "0.5.1") (version "0.5.1")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/hyprwm/hyprlang") (uri
(commit (string-append "v" version)))) (git-reference
(sha256 (url "https://github.com/hyprwm/hyprlang")
(base32 (commit
"1vgvbnd6l5iymb66zdcslhs4w20a7i013qmf4jnxx10z1p8rfkg7")))))) (string-append "v" version))))
(sha256
(base32
"1vgvbnd6l5iymb66zdcslhs4w20a7i013qmf4jnxx10z1p8rfkg7"))))))
(define-public hyprland (define-public hyprland
(package (package
(name "hyprland") (name "hyprland")
(version "0.39.0") (version "0.39.0")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/hyprwm/hyprland") (uri
(commit (string-append "v" version)) (git-reference
(recursive? #t))) (url "https://github.com/hyprwm/hyprland")
(sha256 (commit
(base32 (string-append "v" version))
"0v6xadkrl138irq43s7y747krdirqz9fskw74jbizs5nij1qm9qi")))) (recursive? #t)))
(sha256
(base32
"0v6xadkrl138irq43s7y747krdirqz9fskw74jbizs5nij1qm9qi"))))
(build-system cmake-build-system ) (build-system cmake-build-system )
(arguments (arguments
(list #:build-type "release" (list #:build-type "release"
#:cmake utils:cmake #:cmake utils:cmake
#:parallel-build? #t #:parallel-build? #t
#:out-of-source? #t #:out-of-source? #t
#:tests? #f
#:configure-flags #~(list "-DNO_XWAYLAND=1" #:configure-flags #~(list "-DNO_XWAYLAND=1"
"-DNO_SYSTEMD=1") "-DNO_SYSTEMD=1")
#:phases #~(modify-phases %standard-phases #:phases #~(modify-phases %standard-phases
(delete 'check) (replace 'install
(replace 'install (lambda _
(lambda _ (with-directory-excursion
(with-directory-excursion "../source"
"../source" (invoke "ln" "-s" "../build" "build")
(invoke "ln" "-s" "../build" "build") (invoke "make"
(invoke "make" (string-append "PREFIX=" #$output)
(string-append "PREFIX=" #$output) "install")
"install") (invoke "make"
(invoke "make" (string-append "PREFIX=" #$output)
(string-append "PREFIX=" #$output) "installheaders")))))))
"installheaders")))))))
(native-inputs (native-inputs
(list cpio (list cpio
meson meson
@ -287,18 +345,52 @@ effects, has a very flexible IPC model allowing for a lot of customization, and
more.") more.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public hyprland-xwayland
(package
(inherit hyprland)
(name "hyprland-xwayland")
(arguments
(substitute-keyword-arguments
(package-arguments hyprland)
((#:configure-flags _)
#~(list "-DNO_SYSTEMD=1"
(string-append "-DCMAKE_IGNORE_PATH="
#$(file-append xorg-server-xwayland "/include"))))
((#:phases oldphases #~%standard-phases)
#~(modify-phases #$oldphases
(add-before 'configure 'fix-CMakeLists.txt
(lambda _
(invoke "sed" "-i" "s/xcb xwayland/xcb/g" "CMakeLists.txt")))))))
(propagated-inputs
(list xorg-server-xwayland))
(native-inputs
(modify-inputs
(package-native-inputs hyprland)))
(inputs
(modify-inputs
(package-inputs hyprland)
(append libxcomposite)
(append libxfixes)
(append xcb-util)
(append xcb-util-errors)
(append xcb-util-image)
(append xcb-util-wm)
(append xorg-server-xwayland)))))
(define-public hyprland-plugin-hyprsplit (define-public hyprland-plugin-hyprsplit
(package (package
(name "hyprland-plugin-hyprsplit") (name "hyprland-plugin-hyprsplit")
(version "3b71eaf") (version "3b71eaf")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/shezdy/hyprsplit.git") (uri
(commit version))) (git-reference
(sha256 (url "https://github.com/shezdy/hyprsplit.git")
(base32 (commit version)))
"0cqr5h5lkwcadavsh9yx0xbc88rlr29s3zws1694ya8ayalbappx")))) (sha256
(base32
"0cqr5h5lkwcadavsh9yx0xbc88rlr29s3zws1694ya8ayalbappx"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
@ -329,14 +421,17 @@ more.")
(package (package
(name "hyprpaper") (name "hyprpaper")
(version "0.6.0") (version "0.6.0")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/hyprwm/hyprpaper.git") (uri
(commit (string-append "v" version)))) (git-reference
(sha256 (url "https://github.com/hyprwm/hyprpaper.git")
(base32 (commit
"0bcb2jfnw5752h3lyflvl12v9m61yrdmff1ry2y98m42v1l6gb4s")))) (string-append "v" version))))
(sha256
(base32
"0bcb2jfnw5752h3lyflvl12v9m61yrdmff1ry2y98m42v1l6gb4s"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -348,9 +443,13 @@ more.")
(invoke "make" "protocols"))) (invoke "make" "protocols")))
(replace 'install (replace 'install
(lambda _ (lambda _
(let* ((output (assoc-ref %outputs "out")) (let*
(out-bin (string-append output "/bin"))) ((output
(use-modules (guix build utils)) (assoc-ref %outputs "out"))
(out-bin
(string-append output "/bin")))
(use-modules
(guix build utils))
(invoke "ls") (invoke "ls")
(install-file "./hyprpaper" (install-file "./hyprpaper"
out-bin)))) out-bin))))
@ -380,14 +479,17 @@ more.")
(package (package
(name "hypridle") (name "hypridle")
(version "0.1.1") (version "0.1.1")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/hyprwm/hypridle.git") (uri
(commit (string-append "v" version)))) (git-reference
(sha256 (url "https://github.com/hyprwm/hypridle.git")
(base32 (commit
"0k0izx34zp65lawl25n8my2m4yfql9zmfljlkz50k4yr8d9qbb31")))) (string-append "v" version))))
(sha256
(base32
"0k0izx34zp65lawl25n8my2m4yfql9zmfljlkz50k4yr8d9qbb31"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -410,14 +512,17 @@ more.")
(package (package
(name "hyprlock") (name "hyprlock")
(version "0.3.0") (version "0.3.0")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/hyprwm/hyprlock.git") (uri
(commit (string-append "v" version)))) (git-reference
(sha256 (url "https://github.com/hyprwm/hyprlock.git")
(base32 (commit
"0w2a25hivn8xd8p05vc9xg57rd9siv12dwmr4skpqx4dcmxxbg5d")))) (string-append "v" version))))
(sha256
(base32
"0w2a25hivn8xd8p05vc9xg57rd9siv12dwmr4skpqx4dcmxxbg5d"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -454,50 +559,58 @@ 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 "1.3.1") (version "1.3.1")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/hyprwm/xdg-desktop-portal-hyprland") (uri
(commit (string-append "v" version)))) (git-reference
(file-name (git-file-name name version)) (url "https://github.com/hyprwm/xdg-desktop-portal-hyprland")
(sha256 (commit
(base32 (string-append "v" version))))
"0fdbzxanmmzrvb9wfzg1pdsnlg7dl6v5k8bl44w10n48s7bbbzn0")))) (file-name
(build-system qt-build-system) (git-file-name name version))
(arguments (sha256
(list #:tests? #f ;No tests (base32
#:qtbase qtbase "0fdbzxanmmzrvb9wfzg1pdsnlg7dl6v5k8bl44w10n48s7bbbzn0"))))
#:phases (build-system qt-build-system)
#~(modify-phases %standard-phases (arguments
(add-after 'unpack 'fix-path (list #:tests? #f ;No tests
(lambda* (#:key inputs #:allow-other-keys) #:qtbase qtbase
(substitute* (find-files "." "\\.cp?*$") #:phases
(("/bin/sh") "sh") #~(modify-phases %standard-phases
(("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd) (add-after 'unpack 'fix-path
(search-input-file inputs (string-append "/bin/" cmd))) (lambda*
(("\\<(hyprland-share-picker)\\>" _ cmd) (#:key inputs #:allow-other-keys)
(string-append #$output "/bin/" cmd)))))))) (substitute*
(native-inputs (find-files "." "\\.cp?*$")
(list gcc-13 pkg-config wayland)) (("/bin/sh")
(inputs "sh")
(list bash-minimal (("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd)
grim (search-input-file inputs
hyprland (string-append "/bin/" cmd)))
rosenthal:hyprland-protocols (("\\<(hyprland-share-picker)\\>" _ cmd)
hyprlang (string-append #$output "/bin/" cmd))))))))
mesa (native-inputs
pipewire (list gcc-13 pkg-config wayland))
qtwayland (inputs
sdbus-c++ (list bash-minimal
slurp grim
wayland-protocols)) hyprland
(home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland") rosenthal:hyprland-protocols
(synopsis "XDG Desktop Portal backend for Hyprland") hyprlang
(description mesa
"This package provides @code{xdg-desktop-portal-hyprland}, which extends pipewire
qtwayland
sdbus-c++
slurp
wayland-protocols))
(home-page "https://github.com/hyprwm/xdg-desktop-portal-hyprland")
(synopsis "XDG Desktop Portal backend for Hyprland")
(description
"This package provides @code{xdg-desktop-portal-hyprland}, which extends
@code{xdg-desktop-portal-wlr} for Hyprland with support for @code{xdg-desktop-portal-wlr} for Hyprland with support for
@code{xdg-desktop-portal} screenshot and casting interfaces, while adding a few @code{xdg-desktop-portal} screenshot and casting interfaces, while adding a few
extra portals specific to Hyprland, mostly for window sharing.") extra portals specific to Hyprland, mostly for window sharing.")
(license license:bsd-3))) (license license:bsd-3)))

32
zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch Normal file
View File

@ -0,0 +1,32 @@
diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt
*** zig.orig/CMakeLists.txt 2024-04-16 00:59:10.664981173 +0200
--- zig/CMakeLists.txt 2024-04-16 01:01:00.747848186 +0200
***************
*** 904,909 ****
--- 904,919 ----
set(ZIG_PIE_ARG "")
endif()
+ # Use LIBRARY_PATH
+ string(REPLACE ":" ";" LIBRARY_PATH "$ENV{LIBRARY_PATH}")
+ set(SEARCH_PATHS "")
+
+ foreach(PATH ${LIBRARY_PATH})
+ list(APPEND SEARCH_PATHS "--search-prefix ${PATH}")
+ endforeach()
+
+ list(JOIN SEARCH_PATHS " " SEARCH_PREFIXES)
+
# -Dno-langref is currently hardcoded because building the langref takes too damn long
# To obtain these two forms of documentation, run zig build against stage3 rather than stage2.
set(ZIG_BUILD_ARGS
***************
*** 919,924 ****
--- 929,935 ----
"-Dtarget=${ZIG_TARGET_TRIPLE}"
"-Dcpu=${ZIG_TARGET_MCPU}"
"-Dversion-string=${RESOLVED_ZIG_VERSION}"
+ "${SEARCH_PREFIXES}"
)
add_custom_target(stage3 ALL

2
zilti/packages/zig.scm
View File

@ -38,6 +38,8 @@
(url "https://github.com/ziglang/zig.git") (url "https://github.com/ziglang/zig.git")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches
"zig-0.11-use-LIBRARY_PATH.patch"))
(sha256 (sha256
(base32 "0qh7c27cd4wcdjj0mbpkarvwypfk1js8hkyxs0z149qv75zkbrca")))) (base32 "0qh7c27cd4wcdjj0mbpkarvwypfk1js8hkyxs0z149qv75zkbrca"))))
(arguments (arguments