summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Fufezan <mihai@fufexan.net>2024-12-23 20:07:12 +0200
committerMihai Fufezan <mihai@fufexan.net>2024-12-23 20:07:12 +0200
commit68a5842f06e33d381e9afbf9c9492ba5a7aa2d0f (patch)
tree096533c501b91ee58007f8461b3e4b8205977489
parent5f7ad767dbf0bac9ddd6bf6c825fb9ed7921308a (diff)
Nix: fix TAG substitution
-rw-r--r--nix/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nix/default.nix b/nix/default.nix
index 50f0560f..9293a35c 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -50,12 +50,12 @@
nvidiaPatches ? false,
hidpiXWayland ? false,
}: let
- inherit (builtins) baseNameOf foldl';
+ inherit (builtins) baseNameOf foldl' readFile;
inherit (lib.asserts) assertMsg;
inherit (lib.attrsets) mapAttrsToList;
inherit (lib.lists) flatten concatLists optional optionals;
inherit (lib.sources) cleanSourceWith cleanSource;
- inherit (lib.strings) hasSuffix makeBinPath optionalString mesonBool mesonEnable;
+ inherit (lib.strings) hasSuffix makeBinPath optionalString mesonBool mesonEnable trim;
adapters = flatten [
stdenvAdapters.useMoldLinker
@@ -91,7 +91,7 @@ in
DATE = date;
DIRTY = optionalString (commit == "") "dirty";
HASH = commit;
- TAG = "v${builtins.readFile "${finalAttrs.src}/VERSION"}";
+ TAG = "v${trim (readFile "${finalAttrs.src}/VERSION")}";
depsBuildBuild = [
pkg-config