public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit f8a8fc6c7c.
This commit is contained in:
Vladimír Čunát
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libgda/default.nix
View File

@@ -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 = {