diff options
| author | MightyPlaza <[email protected]> | 2023-12-17 14:29:58 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-17 14:29:58 +0000 |
| commit | 2a777cb71bc727836ca9c73ebb193773a99f8f1e (patch) | |
| tree | 41cf460712f68a90966060734e5fdd74b7359b3f /nix | |
| parent | 9ca0c7d814d6039450ff0341556faa1ce9b37e82 (diff) | |
| download | Hyprland-2a777cb71bc727836ca9c73ebb193773a99f8f1e.tar.gz Hyprland-2a777cb71bc727836ca9c73ebb193773a99f8f1e.zip | |
hyprctl: add commit date to "hyprctl version" (#4171)
* add commit date to "hyprctl version"
modified: scripts/generateVersion.sh
modified: src/debug/HyprCtl.cpp
modified: src/version.h.in
* Nix: add date to hyprctl
---------
Co-authored-by: Mihai Fufezan <[email protected]>
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 3 | ||||
| -rw-r--r-- | nix/overlays.nix | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nix/default.nix b/nix/default.nix index d80a42a9..4b1be0e2 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -1,6 +1,5 @@ { lib, - fetchurl, stdenv, pkg-config, makeWrapper, @@ -35,6 +34,7 @@ wrapRuntimeDeps ? true, version ? "git", commit, + date, # deprecated flags enableNvidiaPatches ? false, nvidiaPatches ? false, @@ -119,6 +119,7 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov --replace "@HASH@" '${commit}' \ --replace "@BRANCH@" "" \ --replace "@MESSAGE@" "" \ + --replace "@DATE@" "${date}" \ --replace "@TAG@" "" \ --replace "@DIRTY@" '${ if commit == "" diff --git a/nix/overlays.nix b/nix/overlays.nix index 3658cdfd..5eb7b082 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -28,17 +28,20 @@ in { self.overlays.wlroots-hyprland self.overlays.udis86 # Hyprland packages themselves - (final: prev: { + (final: prev: let + date = mkDate (self.lastModifiedDate or "19700101"); + in { hyprland = final.callPackage ./default.nix { stdenv = final.gcc13Stdenv; - version = "${props.version}+date=${mkDate (self.lastModifiedDate or "19700101")}_${self.shortRev or "dirty"}"; + version = "${props.version}+date=${date}_${self.shortRev or "dirty"}"; wlroots = final.wlroots-hyprland; commit = self.rev or ""; inherit (final) udis86 hyprland-protocols; + inherit date; }; hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;}; hyprland-debug = final.hyprland.override {debug = true;}; - hyprland-legacy-renderer = final.hyprland.override { legacyRenderer = true; }; + hyprland-legacy-renderer = final.hyprland.override {legacyRenderer = true;}; hyprland-nvidia = builtins.trace '' hyprland-nvidia was removed. Please use the hyprland package. |