diff options
Diffstat (limited to 'pkgs/development/libraries/libsoup')
-rw-r--r-- | pkgs/development/libraries/libsoup/bad-symbol.patch | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 13 |
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libsoup/bad-symbol.patch b/pkgs/development/libraries/libsoup/bad-symbol.patch new file mode 100644 index 000000000000..df1b0af0c69b --- /dev/null +++ b/pkgs/development/libraries/libsoup/bad-symbol.patch @@ -0,0 +1,10 @@ +--- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700 ++++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700 +@@ -348,7 +348,6 @@ + soup_server_get_async_context + soup_server_get_listener + soup_server_get_listeners +-soup_server_get_gsocket + soup_server_get_port + soup_server_get_type + soup_server_get_uris diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 049d6646ec8a..82629ca3c6fa 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,29 +3,30 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.45"; - version = "${majorVersion}.3"; + majorVersion = "2.48"; + version = "${majorVersion}.0"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva"; + sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784"; }; patchPhase = '' patchShebangs libsoup/ + patch -p1 < ${./bad-symbol.patch} ''; - 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"; |