diff options
| -rw-r--r-- | pkgs/development/libraries/libsoup/2.44.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 1 insertions, 40 deletions
diff --git a/pkgs/development/libraries/libsoup/2.44.nix b/pkgs/development/libraries/libsoup/2.44.nix deleted file mode 100644 index 4bef93ff8cd..00000000000 --- a/pkgs/development/libraries/libsoup/2.44.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection -, glib, libxml2, sqlite, glib_networking -, gnomeSupport ? true, libgnome_keyring -}: - -stdenv.mkDerivation { - name = "libsoup-2.44.2"; - - meta = { - description = "HTTP client/server library"; - license = stdenv.lib.licenses.lgpl2Plus; - }; - - src = fetchurl { - url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz; - sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77"; - }; - - preConfigure = '' - substituteInPlace libsoup/tld-parser.py \ - --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}" - ''; - - nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ]; - - propagatedBuildInputs = [ glib libxml2 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"; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8507fe0eed2..6b28eb79073 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4120,9 +4120,7 @@ let geoclue = callPackage ../development/libraries/geoclue {}; - geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix { - libsoup = libsoup_2_44; - }; + geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; geoip = builderDefsPackage ../development/libraries/geoip { inherit zlib; @@ -4928,7 +4926,6 @@ let libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { }; - libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { }; libssh = callPackage ../development/libraries/libssh { }; @@ -5734,7 +5731,6 @@ let }; webkitgtk = callPackage ../development/libraries/webkitgtk { - libsoup = libsoup_2_44; harfbuzz = harfbuzz.override { withIcu = true; }; |