From 19025f89ec1f160afc8dceb4bc63d884b4efadf0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Nov 2025 16:26:23 +0100 Subject: [PATCH] conmon: use `GIT_COMMIT` --- pkgs/by-name/co/conmon/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/conmon/package.nix b/pkgs/by-name/co/conmon/package.nix index f412f33c9c39..ad0840384a40 100644 --- a/pkgs/by-name/co/conmon/package.nix +++ b/pkgs/by-name/co/conmon/package.nix @@ -19,9 +19,20 @@ stdenv.mkDerivation (finalAttrs: { owner = "containers"; repo = "conmon"; tag = "v${finalAttrs.version}"; - hash = "sha256-XsVWcJsUc0Fkn7qGRJDG5xrQAsJr6KN7zMy3AtPuMTo="; + hash = "sha256-/Kt49c8a+R/+Z3KmFLpRTG+BdfPDAOEUtSis3alLAUQ="; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse HEAD > COMMIT + rm -rf .git + ''; }; + preConfigure = '' + substituteInPlace Makefile \ + --replace-fail "(GIT_COMMIT)" "(shell cat COMMIT)" + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib @@ -36,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { # manpage requires building the vendored go-md2man makeFlags = [ "bin/conmon" - "VERSION=${finalAttrs.version}" ]; installPhase = ''