ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 22:27:30 +03:00
Code Issues Projects Releases Wiki Activity

libsoup: always add sqlite as a build dependency

Browse Source 
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
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libsoup/default.nix
View File

@ -18,14 +18,14 @@ stdenv.mkDerivation {
patchShebangs libsoup/ patchShebangs libsoup/
''; '';
buildInputs = libintlOrEmpty ++ [ intltool python ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
passthru.propagatedUserEnvPackages = [ glib_networking ]; passthru.propagatedUserEnvPackages = [ glib_networking ];
# glib_networking is a runtime dependency, not a compile-time dependency # 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"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";