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 | 9 |
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libsoup/bad-symbol.patch b/pkgs/development/libraries/libsoup/bad-symbol.patch deleted file mode 100644 index df1b0af0c69..00000000000 --- a/pkgs/development/libraries/libsoup/bad-symbol.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 82629ca3c6f..f71cc77321a 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection +, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection , libintlOrEmpty , intltool, python }: let - majorVersion = "2.48"; + majorVersion = "2.50"; version = "${majorVersion}.0"; in stdenv.mkDerivation { @@ -11,12 +11,11 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784"; + sha256 = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b"; }; patchPhase = '' patchShebangs libsoup/ - patch -p1 < ${./bad-symbol.patch} ''; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]; @@ -30,6 +29,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + postInstall = "rm -rf $out/share/gtk-doc"; + meta = { inherit (glib.meta) maintainers platforms; }; |