public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove libsoup_2_44

Browse Source
This commit is contained in:
Benno Fünfstück 2014-01-30 18:48:16 +01:00
parent 49b668f5d2
commit e0b8a4cc5e
2 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/libraries/libsoup/2.44.nix
View File

@ -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";
}

6
pkgs/top-level/all-packages.nix
View File

@ -4120,9 +4120,7 @@ let
geoclue = callPackage ../development/libraries/geoclue {}; geoclue = callPackage ../development/libraries/geoclue {};
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix { geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
libsoup = libsoup_2_44;
};
geoip = builderDefsPackage ../development/libraries/geoip { geoip = builderDefsPackage ../development/libraries/geoip {
inherit zlib; inherit zlib;
@ -4928,7 +4926,6 @@ let
libsodium = callPackage ../development/libraries/libsodium { }; libsodium = callPackage ../development/libraries/libsodium { };
libsoup = callPackage ../development/libraries/libsoup { }; libsoup = callPackage ../development/libraries/libsoup { };
libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { };
libssh = callPackage ../development/libraries/libssh { }; libssh = callPackage ../development/libraries/libssh { };
@ -5734,7 +5731,6 @@ let
}; };
webkitgtk = callPackage ../development/libraries/webkitgtk { webkitgtk = callPackage ../development/libraries/webkitgtk {
libsoup = libsoup_2_44;
harfbuzz = harfbuzz.override { harfbuzz = harfbuzz.override {
withIcu = true; withIcu = true;
}; };