diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-01-06 08:37:41 -0600 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-01-06 09:56:07 -0500 |
| commit | f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49 (patch) | |
| tree | a56ad92975081363a2764ccea716e4b48d614316 /pkgs/development/libraries/libsoup | |
| parent | c876f7a25dd3437f27628cad3b1168909ab86461 (diff) | |
| download | nixpkgs-f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49.tar nixpkgs-f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49.tar.gz nixpkgs-f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49.tar.bz2 nixpkgs-f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49.tar.lz nixpkgs-f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49.tar.xz nixpkgs-f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49.tar.zst nixpkgs-f570f9722fe6dbcd731a6e46e37d51ccc2ed5e49.zip | |
libsoup: always add sqlite as a build dependency
Also, conditionalize --without-gnome
Diffstat (limited to 'pkgs/development/libraries/libsoup')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index cd2a15ffc66..7f655d27491 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"; |