libsoup: always add sqlite as a build dependency

Also, conditionalize --without-gnome
This commit is contained in:
John Wiegley 2015-01-06 08:37:41 -06:00 committed by Shea Levy
parent c876f7a25d
commit f570f9722f

View file

@ -18,14 +18,14 @@ stdenv.mkDerivation {
patchShebangs libsoup/
'';
buildInputs = libintlOrEmpty ++ [ intltool python ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check";
configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";