From 68a5842f06e33d381e9afbf9c9492ba5a7aa2d0f Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 23 Dec 2024 20:07:12 +0200 Subject: [PATCH] Nix: fix TAG substitution --- nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 50f0560f3..9293a35c7 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