mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 18:33:00 +00:00
Revert "libsoup: Update to 2.40.3"
For some reason, the update to 2.40.3 seems to cause troubles for
surf and vimprobable2.
This reverts commit 9642adef32
.
This commit is contained in:
parent
7b94139e4f
commit
ad1e7be58a
@ -1,29 +1,23 @@
|
||||
{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python
|
||||
{ stdenv, fetchurl, glib, libxml2, pkgconfig
|
||||
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libsoup-2.40.3";
|
||||
name = "libsoup-2.38.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz;
|
||||
sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9";
|
||||
url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
|
||||
sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ pkgconfig intltool python ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ glib libxml2 ]
|
||||
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
|
||||
|
||||
passthru.propagatedUserEnvPackages = [ glib_networking ];
|
||||
|
||||
# glib_networking is a runtime dependency, not a compile-time dependency
|
||||
configureFlags = "--disable-tls-check";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace libsoup/tld-parser.py \
|
||||
--replace "/usr/bin/env python" ${python}/bin/python
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (glib.meta) maintainers platforms;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user