From 10948ed35a04d6cbe05819acf9903e5e7395375b Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Tue, 2 Apr 2024 13:44:56 +0200 Subject: feat(treewide): Also remove hard-coded values in the `templates/` dir --- templates/c/flake.nix | 6 +++--- templates/c/makefile | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'templates/c') diff --git a/templates/c/flake.nix b/templates/c/flake.nix index a211b56..fea015c 100644 --- a/templates/c/flake.nix +++ b/templates/c/flake.nix @@ -51,14 +51,14 @@ treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; # This version is set automatically on `cog bump --auto`; - version = "v0.1.0"; # GUIDING VERSION STRING - pname = "TODO"; + version = "v%INIT_APPLICATION_VERSION"; # GUIDING VERSION STRING + pname = "%INIT_APPLICATION_NAME"; build = pkgs.stdenv.mkDerivation { inherit pname version; src = ./.; - makeFlags = ["PREFIX=${placeholder "out"}"]; + makeFlags = ["PREFIX=${placeholder "out"}" "BIN_VERSION=${version}"]; inherit nativeBuildInputs; }; in { diff --git a/templates/c/makefile b/templates/c/makefile index e5577c4..63ca24c 100644 --- a/templates/c/makefile +++ b/templates/c/makefile @@ -2,7 +2,10 @@ PREFIX := /usr/local BINPREFIX := $(DESTDIR)$(PREFIX)/bin MANPREFIX := $(DESTDIR)$(PREFIX)/share/man/man1 -BIN_NAME := TODO +BIN_NAME := %INIT_APPLICATION_NAME +# This version is set automatically on `cog bump --auto`; +BIN_VERSION := "v%INIT_APPLICATION_VERSION" # GUIDING VERSION STRING + # The trailing slash is important BUILD_DIR := ./target/ BIN_PATH := $(BUILD_DIR)$(BIN_NAME) -- cgit 1.4.1