From 5f43381f999d5903eedf90488e7fba82857b3073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Tue, 8 Oct 2024 22:11:00 +0200 Subject: [PATCH] unixODBCDrivers.mdb: init as mdbtools alias --- pkgs/development/libraries/unixODBCDrivers/default.nix | 4 +++- pkgs/tools/misc/mdbtools/default.nix | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index bd27a36d663a6..28fa989d55154 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unixODBC, cmake, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub, psqlodbc }: +{ fetchurl, stdenv, unixODBC, cmake, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub, psqlodbc, mdbtools }: # Each of these ODBC drivers can be configured in your odbcinst.ini file using # the various passthru and meta values. Of note are: @@ -309,4 +309,6 @@ maintainers = with maintainers; [ sir4ur0n ]; }; }; + + mdb = mdbtools.override { withUnixODBC = true; withLibiodbc = false; }; } diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 979b371a26786..a3822dd17f013 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = lib.optionalAttrs withUnixODBC { + fancyName = "MDBTools"; + driver = "lib/odbc/libmdbodbc.so"; + }; + meta = with lib; { description = ".mdb (MS Access) format tools"; license = with licenses; [ gpl2Plus lgpl2 ];