From fb07320a12f83ffaf80bf3c0aca94a720f865201 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 25 May 2024 02:31:40 +0200
Subject: build: just use nix version as internal version

---
 nix/package.nix           | 10 +---------
 nix/pre-commit-checks.nix |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'nix')

diff --git a/nix/package.nix b/nix/package.nix
index 99eeb88..c45599a 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -11,12 +11,8 @@
   )
 , buildGoApplication ? pkgs.buildGoApplication
 , css
-, self
-, testers
 }:
 let
-  inherit (builtins) concatStringsSep match;
-
   version = "0.1.4";
 in
 buildGoApplication {
@@ -47,11 +43,7 @@ buildGoApplication {
     "-s"
     "-w"
     "-X"
-    "searchix/internal/config.CommitSHA=${self.rev or self.dirtyRev or "unknown"}"
-    "-X"
-    "searchix/internal/config.ShortSHA=${self.shortRev or self.dirtyShortRev or "unknown"}"
-    "-X"
-    "main.buildVersion=${version}"
+    "searchix/internal/config.Version=${version}"
   ];
 
   modules = ../gomod2nix.toml;
diff --git a/nix/pre-commit-checks.nix b/nix/pre-commit-checks.nix
index 5f62494..c3c0f23 100644
--- a/nix/pre-commit-checks.nix
+++ b/nix/pre-commit-checks.nix
@@ -107,7 +107,7 @@ rec {
       entry =
         let
           script = pkgs.writeShellScript "generate-default-config" ''
-            ${pkgs.wgo}/bin/wgo run -exit searchix.go --print-default-config > defaults.toml
+            ${pkgs.wgo}/bin/wgo run -exit ./cmd/searchix-web --print-default-config > defaults.toml
           '';
         in
         builtins.toString script;
-- 
cgit 1.4.1