From f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 6 Jan 2015 08:37:41 -0600 Subject: [PATCH] libsoup: always add sqlite as a build dependency Also, conditionalize --without-gnome --- pkgs/development/libraries/libsoup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index cd2a15ffc668..7f655d274919 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -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";