aboutsummaryrefslogtreecommitdiffhomepage
path: root/nix
diff options
context:
space:
mode:
authorAndrĂ© Silva <[email protected]>2024-05-10 23:51:53 +0100
committerGitHub <[email protected]>2024-05-11 01:51:53 +0300
commita8ab1b1679e639ef23952f1a1d0834859d1c01b7 (patch)
treec24a01a902ca68d73e710f67c89ea0465926d05a /nix
parent6e594e44162ed5ad8fd9db3e552723e32169158a (diff)
downloadHyprland-a8ab1b1679e639ef23952f1a1d0834859d1c01b7.tar.gz
Hyprland-a8ab1b1679e639ef23952f1a1d0834859d1c01b7.zip
nix: build improvements (#5952)
* scripts: allow using existing variable values in generateVersion.sh * nix: populate versioning variables * nix: remove unused meson input * nix: remove unnecessary hyprland-protocols dependency * Nix: remove nixConfig from flake It's more annoying than helpful. * CI/Nix: fix PR build failure --------- Co-authored-by: Mihai Fufezan <[email protected]>
Diffstat (limited to 'nix')
-rw-r--r--nix/default.nix21
1 files changed, 4 insertions, 17 deletions
diff --git a/nix/default.nix b/nix/default.nix
index 4ab9c19d..419b1429 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -5,7 +5,6 @@
pkgconf,
makeWrapper,
cmake,
- meson,
ninja,
binutils,
cairo,
@@ -13,7 +12,6 @@
fribidi,
git,
hyprcursor,
- hyprland-protocols,
hyprlang,
hyprwayland-scanner,
jq,
@@ -72,22 +70,12 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
postPatch = ''
# Fix hardcoded paths to /usr installation
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
-
- # Generate version.h
- cp src/version.h.in src/version.h
- substituteInPlace src/version.h \
- --replace-warn "@HASH@" '${commit}' \
- --replace-warn "@BRANCH@" "" \
- --replace-warn "@MESSAGE@" "" \
- --replace-warn "@DATE@" "${date}" \
- --replace-warn "@TAG@" "" \
- --replace-warn "@DIRTY@" '${
- if commit == ""
- then "dirty"
- else ""
- }'
'';
+ DATE = date;
+ HASH = commit;
+ DIRTY = if commit == "" then "dirty" else "";
+
nativeBuildInputs = lib.concatLists [
[
hyprwayland-scanner
@@ -118,7 +106,6 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
fribidi
git
hyprcursor.dev
- hyprland-protocols
hyprlang
libGL
libdrm