.
This commit is contained in:
parent
35ccb639b8
commit
22c26a2ae4
3 changed files with 15 additions and 18 deletions
|
@ -396,21 +396,25 @@ more.")
|
||||||
(list
|
(list
|
||||||
#:configure-flags #~(list
|
#:configure-flags #~(list
|
||||||
"-Dcpp_std=none"
|
"-Dcpp_std=none"
|
||||||
(string-append "-Dcpp_args=-std=gnu++2b"
|
"-Dcpp_args=-std=gnu++2b")
|
||||||
" -I" #$(file-append wlroots-hyprland "/include")))
|
|
||||||
#:phases #~(modify-phases %standard-phases
|
#:phases #~(modify-phases %standard-phases
|
||||||
(delete 'check))))
|
(delete 'check))))
|
||||||
|
(propagated-inputs
|
||||||
|
(list hyprland-xwayland
|
||||||
|
wayland))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list utils:cmake
|
(list utils:cmake
|
||||||
gcc-13
|
gcc-13
|
||||||
pkg-config
|
pkg-config))
|
||||||
wlroots-hyprland))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list cairo-for-hyprland
|
(list cairo-for-hyprland
|
||||||
hyprland
|
|
||||||
hyprlang
|
hyprlang
|
||||||
libdrm-for-hyprland
|
libdrm-for-hyprland
|
||||||
libinput
|
libinput
|
||||||
|
libxkbcommon
|
||||||
|
xcb-util
|
||||||
|
xcb-util-wm
|
||||||
|
mesa
|
||||||
pixman))
|
pixman))
|
||||||
(home-page "https://github.com/shezdy/hyprsplit")
|
(home-page "https://github.com/shezdy/hyprsplit")
|
||||||
(synopsis "hyprland plugin for separate sets of workspaces on each monitor")
|
(synopsis "hyprland plugin for separate sets of workspaces on each monitor")
|
||||||
|
@ -462,7 +466,6 @@ more.")
|
||||||
mesa
|
mesa
|
||||||
rosenthal:hyprland-protocols
|
rosenthal:hyprland-protocols
|
||||||
wayland-protocols-for-hyprland
|
wayland-protocols-for-hyprland
|
||||||
wlroots-hyprland
|
|
||||||
file
|
file
|
||||||
libglvnd
|
libglvnd
|
||||||
libjpeg-turbo
|
libjpeg-turbo
|
||||||
|
|
|
@ -1,32 +1,26 @@
|
||||||
diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt
|
diff -crB zig.orig/CMakeLists.txt zig/CMakeLists.txt
|
||||||
*** zig.orig/CMakeLists.txt 2024-04-16 00:59:10.664981173 +0200
|
*** zig.orig/CMakeLists.txt 2024-04-16 00:59:10.664981173 +0200
|
||||||
--- zig/CMakeLists.txt 2024-04-16 01:01:00.747848186 +0200
|
--- zig/CMakeLists.txt 2024-04-16 01:38:47.686554540 +0200
|
||||||
***************
|
***************
|
||||||
*** 904,909 ****
|
*** 904,909 ****
|
||||||
--- 904,919 ----
|
--- 904,912 ----
|
||||||
set(ZIG_PIE_ARG "")
|
set(ZIG_PIE_ARG "")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
+ # Use LIBRARY_PATH
|
+ # Use LIBRARY_PATH
|
||||||
+ string(REPLACE ":" ";" LIBRARY_PATH "$ENV{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
|
# -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.
|
# To obtain these two forms of documentation, run zig build against stage3 rather than stage2.
|
||||||
set(ZIG_BUILD_ARGS
|
set(ZIG_BUILD_ARGS
|
||||||
***************
|
***************
|
||||||
*** 919,924 ****
|
*** 919,924 ****
|
||||||
--- 929,935 ----
|
--- 922,929 ----
|
||||||
"-Dtarget=${ZIG_TARGET_TRIPLE}"
|
"-Dtarget=${ZIG_TARGET_TRIPLE}"
|
||||||
"-Dcpu=${ZIG_TARGET_MCPU}"
|
"-Dcpu=${ZIG_TARGET_MCPU}"
|
||||||
"-Dversion-string=${RESOLVED_ZIG_VERSION}"
|
"-Dversion-string=${RESOLVED_ZIG_VERSION}"
|
||||||
+ "${SEARCH_PREFIXES}"
|
+ --search-prefix $<JOIN:LIBRARY_PATH," --search-prefix">
|
||||||
|
+ ${SEARCH_PREFIXES}
|
||||||
)
|
)
|
||||||
|
|
||||||
add_custom_target(stage3 ALL
|
add_custom_target(stage3 ALL
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(patches (search-patches
|
(patches (search-patches
|
||||||
"zig-0.11-use-LIBRARY_PATH.patch"))
|
"zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0qh7c27cd4wcdjj0mbpkarvwypfk1js8hkyxs0z149qv75zkbrca"))))
|
(base32 "0qh7c27cd4wcdjj0mbpkarvwypfk1js8hkyxs0z149qv75zkbrca"))))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
Loading…
Reference in a new issue