From ce5616f178349fd9ad764803be3d529502d34bb1 Mon Sep 17 00:00:00 2001 From: Sebastien Lavoie Date: Tue, 15 Oct 2019 13:58:08 -0400 Subject: [PATCH] gnome3.libgda: explicitly enable or disable mysql and postgres This prevents an issue where mysql and postgres support can be auto-detected by the configure scripts, resulting in a broken build or a build that cannot be ran on a different computer. --- pkgs/development/libraries/libgda/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 270326079963..cc37c50af3e1 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -15,9 +15,11 @@ assert postgresSupport -> postgresql != null; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16vxv2qvysh22s8h9h6irx96sacagxkz0i4qgi1wc6ibly6fvjjr"; }; - configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] - ++ (optional (mysqlSupport) "--with-mysql=yes") - ++ (optional (postgresSupport) "--with-postgres=yes"); + configureFlags = with stdenv.lib; [ + "--enable-gi-system-install=no" + "--with-mysql=${if mysqlSupport then "yes" else "no"}" + "--with-postgres=${if postgresSupport then "yes" else "no"}" + ]; enableParallelBuilding = true;