diff options
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/2_3.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/servers/sql/mariadb/connector-c/2_3.nix b/pkgs/servers/sql/mariadb/connector-c/2_3.nix deleted file mode 100644 index 5a256887cba6..000000000000 --- a/pkgs/servers/sql/mariadb/connector-c/2_3.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "2.3.7"; - sha256 = "13izi35vvxhiwl2dsnqrz75ciisy2s2k30giv7hrm01qlwnmiycl"; -}) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index e8430b01eb60..0e0302685401 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -6,10 +6,7 @@ with stdenv.lib; -let - isVer3 = versionAtLeast version "3.0"; - -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "mariadb-connector-c"; inherit version; @@ -24,7 +21,8 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - ] ++ optional isVer3 "-DWITH_CURL=ON"; + "-DWITH_CURL=ON" + ]; # The cmake setup-hook uses $out/lib by default, this is not the case here. preConfigure = optionalString stdenv.isDarwin '' @@ -32,7 +30,7 @@ in stdenv.mkDerivation { ''; nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ openssl zlib ] ++ optional isVer3 curl; + propagatedBuildInputs = [ curl openssl zlib ]; buildInputs = [ libiconv ]; enableParallelBuilding = true; @@ -41,12 +39,10 @@ in stdenv.mkDerivation { ln -sv mariadb_config $out/bin/mysql_config ln -sv mariadb $out/lib/mysql ln -sv mariadb $out/include/mysql - ${optionalString isVer3 '' - ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a - ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a - ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so - ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so - ''} + ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient.a + ln -sv libmariadbclient.a $out/lib/mariadb/libmysqlclient_r.a + ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient.so + ln -sv libmariadb.so $out/lib/mariadb/libmysqlclient_r.so ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c93eb92deb1d..720580ce272e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14887,10 +14887,8 @@ in rpcbind = callPackage ../servers/rpcbind { }; libmysqlclient = libmysqlclient_3_1; - libmysqlclient_2_3 = mariadb-connector-c_2_3; libmysqlclient_3_1 = mariadb-connector-c_3_1; mariadb-connector-c = mariadb-connector-c_3_1; - mariadb-connector-c_2_3 = callPackage ../servers/sql/mariadb/connector-c/2_3.nix { }; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; mariadb-galera = mariadb-galera_25; |