mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 22:20:51 +00:00
libsoup: always add sqlite as a build dependency
Also, conditionalize --without-gnome
This commit is contained in:
parent
c876f7a25d
commit
f570f9722f
|
@ -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";
|
||||
|
||||
|
|
Loading…
Reference in a new issue