From 3794b8a20b196aa08ef8b6a46f042ff5031b2cb3 Mon Sep 17 00:00:00 2001 From: Saterfield990 Date: Wed, 16 Jul 2025 09:35:50 +0300 Subject: [PATCH 1/2] mdbtools: fix build failure --- pkgs/by-name/md/mdbtools/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix index 381245fef2c7..77703f590ead 100644 --- a/pkgs/by-name/md/mdbtools/package.nix +++ b/pkgs/by-name/md/mdbtools/package.nix @@ -10,6 +10,7 @@ autoreconfHook, txt2man, which, + gettext, }: stdenv.mkDerivation rec { @@ -41,6 +42,10 @@ stdenv.mkDerivation rec { readline ]; + postUnpack = '' + cp -v ${gettext}/share/gettext/m4/lib-{link,prefix,ld}.m4 source/m4 + ''; + enableParallelBuilding = true; meta = with lib; { From 1c82e688dc81a11c9d5eeacb65e4b7f24032b45a Mon Sep 17 00:00:00 2001 From: Saterfield990 Date: Wed, 16 Jul 2025 09:38:01 +0300 Subject: [PATCH 2/2] mdbtools: improve --- pkgs/by-name/md/mdbtools/package.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/md/mdbtools/package.nix b/pkgs/by-name/md/mdbtools/package.nix index 77703f590ead..9a581078b72a 100644 --- a/pkgs/by-name/md/mdbtools/package.nix +++ b/pkgs/by-name/md/mdbtools/package.nix @@ -11,17 +11,19 @@ txt2man, which, gettext, + nix-update-script, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mdbtools"; version = "1.0.1"; src = fetchFromGitHub { owner = "mdbtools"; repo = "mdbtools"; - rev = "v${version}"; - sha256 = "sha256-XWkFgQZKx9/pjVNEqfp9BwgR7w3fVxQ/bkJEYUvCXPs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-XWkFgQZKx9/pjVNEqfp9BwgR7w3fVxQ/bkJEYUvCXPs="; }; configureFlags = [ "--disable-scrollkeeper" ]; @@ -48,14 +50,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/mdb-ver"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/mdbtools/mdbtools/releases/tag/v${finalAttrs.version}"; description = ".mdb (MS Access) format tools"; - license = with licenses; [ + homepage = "https://mdbtools.github.io/"; + license = with lib.licenses; [ gpl2Plus lgpl2 ]; - maintainers = [ ]; - platforms = platforms.unix; - inherit (src.meta) homepage; + platforms = lib.platforms.unix; }; -} +})