diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
| commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
| tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/development/libraries/libgda | |
| parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
| download | nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixpkgs-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip | |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/development/libraries/libgda')
| -rw-r--r-- | pkgs/development/libraries/libgda/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index bb6402dc428..27032607996 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee , overrideCC, gcc6 -, mysqlSupport ? false, mysql ? null +, mysqlSupport ? false, libmysqlclient ? null , postgresSupport ? false, postgresql ? null }: -assert mysqlSupport -> mysql != null; +assert mysqlSupport -> libmysqlclient != null; assert postgresSupport -> postgresql != null; (if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { @@ -25,7 +25,7 @@ assert postgresSupport -> postgresql != null; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ]; buildInputs = with stdenv.lib; [ gtk3 openssl libgee ] - ++ optional (mysqlSupport) mysql.connector-c + ++ optional (mysqlSupport) libmysqlclient ++ optional (postgresSupport) postgresql; passthru = { |