lol

libdbiDrivers: libmysql -> connector-c

+5 -5
+3 -3
pkgs/development/libraries/libdbi-drivers/default.nix
··· 1 1 { stdenv, fetchurl, libdbi 2 - , libmysql ? null, sqlite ? null, postgresql ? null 2 + , mysql ? null, sqlite ? null, postgresql ? null 3 3 }: 4 4 5 5 with stdenv.lib; ··· 11 11 sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; 12 12 }; 13 13 14 - buildInputs = [ libdbi libmysql sqlite postgresql ]; 14 + buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql.connector-c; 15 15 16 16 postPatch = '' 17 17 sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; ··· 24 24 "--enable-libdbi" 25 25 "--with-dbi-incdir=${libdbi}/include" 26 26 "--with-dbi-libdir=${libdbi}/lib" 27 - ] ++ optionals (libmysql != null) [ 27 + ] ++ optionals (mysql != null) [ 28 28 "--with-mysql" 29 29 ] ++ optionals (postgresql != null) [ 30 30 "--with-pgsql"
+2 -2
pkgs/top-level/all-packages.nix
··· 9178 9178 libdbi = callPackage ../development/libraries/libdbi { }; 9179 9179 9180 9180 libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { 9181 - libmysql = null; 9181 + mysql = null; 9182 9182 sqlite = null; 9183 9183 }; 9184 9184 9185 9185 libdbiDrivers = libdbiDriversBase.override { 9186 - inherit sqlite libmysql; 9186 + inherit sqlite mysql; 9187 9187 }; 9188 9188 9189 9189 libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { };