hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix: add missing deps

Browse source 
CMake used to warn about these deps so I've added them.

Also propagates wlroots' nativeBuildInputs.
This commit is contained in:
Mihai Fufezan 2024-05-05 20:34:13 +03:00
parent 1ed1ce9506
commit c7fbc30bfd
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
1 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
nix/default.nix
View file

@ -10,6 +10,7 @@
binutils, binutils,
cairo, cairo,
expat, expat,
fribidi,
git, git,
hyprcursor, hyprcursor,
hyprland-protocols, hyprland-protocols,
@ -17,14 +18,19 @@
hyprwayland-scanner, hyprwayland-scanner,
jq, jq,
libGL, libGL,
libdatrie,
libdrm, libdrm,
libexecinfo, libexecinfo,
libinput, libinput,
libselinux,
libsepol,
libthai,
libuuid, libuuid,
libxkbcommon, libxkbcommon,
mesa, mesa,
pango, pango,
pciutils, pciutils,
pcre2,
python3, python3,
systemd, systemd,
tomlplusplus, tomlplusplus,
@ -70,28 +76,31 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
# Generate version.h # Generate version.h
cp src/version.h.in src/version.h cp src/version.h.in src/version.h
substituteInPlace src/version.h \ substituteInPlace src/version.h \
--replace "@HASH@" '${commit}' \ --replace-warn "@HASH@" '${commit}' \
--replace "@BRANCH@" "" \ --replace-warn "@BRANCH@" "" \
--replace "@MESSAGE@" "" \ --replace-warn "@MESSAGE@" "" \
--replace "@DATE@" "${date}" \ --replace-warn "@DATE@" "${date}" \
--replace "@TAG@" "" \ --replace-warn "@TAG@" "" \
--replace "@DIRTY@" '${ --replace-warn "@DIRTY@" '${
if commit == "" if commit == ""
then "dirty" then "dirty"
else "" else ""
}' }'
''; '';
nativeBuildInputs = [ nativeBuildInputs = lib.concatLists [
hyprwayland-scanner [
jq hyprwayland-scanner
makeWrapper jq
cmake makeWrapper
meson cmake
ninja ninja
pkg-config pkg-config
python3 python3
wayland-scanner wayland-scanner
]
# introduce this later so that cmake takes precedence
wlroots.nativeBuildInputs
]; ];
outputs = [ outputs = [
@ -106,18 +115,24 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
[ [
cairo cairo
expat expat
fribidi
git git
hyprcursor.dev hyprcursor.dev
hyprland-protocols hyprland-protocols
hyprlang hyprlang
libdrm
libGL libGL
libdrm
libdatrie
libinput libinput
libselinux
libsepol
libthai
libuuid libuuid
libxkbcommon libxkbcommon
mesa mesa
pango pango
pciutils pciutils
pcre2
tomlplusplus tomlplusplus
wayland wayland
wayland-protocols wayland-protocols