diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-13 22:46:46 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:44 +0100 |
| commit | af766c764ed598e1761008a1f075e2cb1b09f617 (patch) | |
| tree | f25b8e6fccc968dbc289c970dc5cbe814696990f /pkgs/development/libraries/libsoup | |
| parent | 04a7df366cd7b2fdaa9bda0f070bbd3ac643ca77 (diff) | |
libsoup: fix build & clean up
Diffstat (limited to 'pkgs/development/libraries/libsoup')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 853219ba5398..dad245d0791e 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig, gnome3 -, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection -, valaSupport ? true, vala_0_38 +{ stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3 +, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection +, valaSupport ? true, vala_0_40 , libintlOrEmpty -, intltool, python }: +, intltool, python3 }: let pname = "libsoup"; version = "2.62.0"; @@ -22,27 +22,19 @@ stdenv.mkDerivation rec { substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" ''; - patches = [ - # remove for >= 2.60.3 - (fetchpatch { - name = "buffer-overflow.patch"; # https://bugzilla.gnome.org/show_bug.cgi?id=788037 - url = "https://git.gnome.org/browse/libsoup/patch/?id=b79689833ba"; - sha256 = "1azbk540mbm4c6ip54ixbg9d6w7nkls9y81fzm3csq9a5786r3d3"; - }) - ]; - outputs = [ "out" "dev" ]; - buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] - ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ]; + buildInputs = libintlOrEmpty ++ [ python3 sqlite ]; + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ] + ++ stdenv.lib.optionals valaSupport [ vala_0_40 ]; + propagatedBuildInputs = [ glib libxml2 ]; # glib-networking is a runtime dependency, not a compile-time dependency - configureFlags = "--disable-tls-check" - + " --enable-vala=${if valaSupport then "yes" else "no"}" - + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; + configureFlags = [ + "--disable-tls-check" + "--enable-vala=${if valaSupport then "yes" else "no"}" + "--with-gnome=${if gnomeSupport then "yes" else "no"}" + ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; |