Move libsoup to development/libraries
It is used in many packages outside of gnome2 set. svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197
This commit is contained in:
parent
a47127de32
commit
d96524476d
|
@ -73,8 +73,6 @@
|
|||
|
||||
gnome_keyring = callPackage ./desktop/gnome-keyring { };
|
||||
|
||||
libsoup = callPackage ./desktop/libsoup { };
|
||||
|
||||
libwnck = callPackage ./desktop/libwnck { };
|
||||
|
||||
libgweather = callPackage ./desktop/libgweather { };
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
|
||||
libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
|
||||
|
||||
libsoup = callPackage ./platform/libsoup.nix { };
|
||||
|
||||
GConf = callPackage ./platform/GConf.nix { };
|
||||
|
||||
gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
{ stdenv, fetchurl, glib, libxml2, pkgconfig, xz
|
||||
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libsoup-2.36.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz;
|
||||
sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk";
|
||||
};
|
||||
|
||||
|
||||
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";
|
||||
|
||||
meta = {
|
||||
inherit (glib.meta) maintainers platforms;
|
||||
};
|
||||
}
|
|
@ -4171,6 +4171,8 @@ let
|
|||
|
||||
libsndfile = callPackage ../development/libraries/libsndfile { };
|
||||
|
||||
libsoup = callPackage ../development/libraries/libsoup { };
|
||||
|
||||
libssh = callPackage ../development/libraries/libssh { };
|
||||
|
||||
libssh2 = callPackage ../development/libraries/libssh2 { };
|
||||
|
@ -7877,10 +7879,13 @@ let
|
|||
# import ../desktops/e17 { inherit callPackage pkgs; }
|
||||
# );
|
||||
|
||||
gnome2 = (callPackage ../desktops/gnome-2 {
|
||||
gnome2 = callPackage ../desktops/gnome-2 {
|
||||
callPackage = pkgs.newScope pkgs.gnome2;
|
||||
self = pkgs.gnome2;
|
||||
} // pkgs.gtkLibs);
|
||||
} // pkgs.gtkLibs // {
|
||||
# Backwards compatibility;
|
||||
inherit (pkgs) libsoup;
|
||||
};
|
||||
|
||||
gnome3 = (import ../desktops/gnome-3 {
|
||||
callPackage = pkgs.newScope pkgs.gnome3;
|
||||
|
|
Loading…
Reference in a new issue