ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Move libsoup to development/libraries

Browse Source 
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:
Yury G. Kudryashov 2012-03-17 16:45:37 +00:00
parent a47127de32
commit d96524476d
5 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-2/default.nix
View File

@ -73,8 +73,6 @@
gnome_keyring = callPackage ./desktop/gnome-keyring { }; gnome_keyring = callPackage ./desktop/gnome-keyring { };
libsoup = callPackage ./desktop/libsoup { };
libwnck = callPackage ./desktop/libwnck { }; libwnck = callPackage ./desktop/libwnck { };
libgweather = callPackage ./desktop/libgweather { }; libgweather = callPackage ./desktop/libgweather { };

2
pkgs/desktops/gnome-3/default.nix
View File

@ -12,8 +12,6 @@
libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { }; libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
libsoup = callPackage ./platform/libsoup.nix { };
GConf = callPackage ./platform/GConf.nix { }; GConf = callPackage ./platform/GConf.nix { };
gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { }; gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };

24
pkgs/desktops/gnome-3/platform/libsoup.nix
View File

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

0
pkgs/desktops/gnome-2/desktop/libsoup/default.nix → pkgs/development/libraries/libsoup/default.nix
View File

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

@ -4171,6 +4171,8 @@ let
libsndfile = callPackage ../development/libraries/libsndfile { }; libsndfile = callPackage ../development/libraries/libsndfile { };
libsoup = callPackage ../development/libraries/libsoup { };
libssh = callPackage ../development/libraries/libssh { }; libssh = callPackage ../development/libraries/libssh { };
libssh2 = callPackage ../development/libraries/libssh2 { }; libssh2 = callPackage ../development/libraries/libssh2 { };
@ -7877,10 +7879,13 @@ let
# import ../desktops/e17 { inherit callPackage pkgs; } # import ../desktops/e17 { inherit callPackage pkgs; }
# ); # );
gnome2 = (callPackage ../desktops/gnome-2 { gnome2 = callPackage ../desktops/gnome-2 {
callPackage = pkgs.newScope pkgs.gnome2; callPackage = pkgs.newScope pkgs.gnome2;
self = pkgs.gnome2; self = pkgs.gnome2;
} // pkgs.gtkLibs); } // pkgs.gtkLibs // {
# Backwards compatibility;
inherit (pkgs) libsoup;
};
gnome3 = (import ../desktops/gnome-3 { gnome3 = (import ../desktops/gnome-3 {
callPackage = pkgs.newScope pkgs.gnome3; callPackage = pkgs.newScope pkgs.gnome3;