From 24fb9ac79e4da9ba1a9c8d83b56b3dcf0226c4ba Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Fri, 2 May 2025 15:01:33 -0700 Subject: [PATCH] Pass flake git rev down to package ldflags --- flake.nix | 3 ++- package.nix | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 50afefd..7d9d39a 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ inherit (nixpkgs.lib) nixosSystem; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; + gitRev = toString (self.rev or self.dirtyRev or "0000000000000000000000000000000000000000"); in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; @@ -48,7 +49,7 @@ }; overlays.default = final: prev: { - intake = final.callPackage ./package.nix { }; + intake = final.callPackage ./package.nix { inherit gitRev; }; }; nixosModules.default = import ./module.nix self; diff --git a/package.nix b/package.nix index b2b9ed9..9e4c326 100644 --- a/package.nix +++ b/package.nix @@ -2,6 +2,7 @@ buildGoModule, jq, lib, + gitRev ? "0000000000000000000000000000000000000000" }: let inherit (lib.fileset) @@ -25,6 +26,10 @@ buildGoModule { }; vendorHash = "sha256-sv4rlURaTatxJ5atYWYzD2O4EiuPp66i0RY5lQzhBKU="; + ldflags = [ + "-X github.com/Jaculabilis/intake/core.Commit=${gitRev}" + ]; + nativeBuildInputs = [ jq ]; meta = { };