From 05fdea6db3f737ab54f36cc10af3c50c8f69239e Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 19 Aug 2024 21:28:45 +0200 Subject: [PATCH] hwinfo: move HWINFO_VERSION to makeFlags --- pkgs/by-name/hw/hwinfo/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index 940127507824..1c993148695e 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -30,11 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # VERSION and changelog are usually generated using Git - # unless HWINFO_VERSION is defined (see Makefile) - export HWINFO_VERSION="${finalAttrs.version}" - sed -i 's|^\(TARGETS\s*=.*\)\\(.*\)$|\1\2|g' Makefile - substituteInPlace Makefile --replace "/sbin" "/bin" --replace "/usr/" "/" substituteInPlace src/isdn/cdb/Makefile --replace "lex isdn_cdb.lex" "flex isdn_cdb.lex" substituteInPlace hwinfo.pc.in --replace "prefix=/usr" "prefix=$out" @@ -54,7 +49,10 @@ stdenv.mkDerivation (finalAttrs: { fi ''; - makeFlags = [ "LIBDIR=/lib" ]; + makeFlags = [ + "LIBDIR=/lib" + "HWINFO_VERSION=${finalAttrs.version}" + ]; installFlags = [ "DESTDIR=$(out)" ];