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

Move glib-networking to top namespace

Browse Source 
svn path=/nixpkgs/trunk/; revision=32905
This commit is contained in:
Yury G. Kudryashov 2012-03-08 16:49:08 +00:00
parent 46b258acb4
commit 1a62d14cdd
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,6 @@
at_spi = callPackage ./platform/at-spi { }; at_spi = callPackage ./platform/at-spi { };
glib_networking = callPackage ./platform/glib-networking { };
gtk_doc = callPackage ./platform/gtk-doc { }; gtk_doc = callPackage ./platform/gtk-doc { };
gtkhtml = callPackage ./platform/gtkhtml { }; gtkhtml = callPackage ./platform/gtkhtml { };

0
pkgs/desktops/gnome-2/platform/glib-networking/default.nix → pkgs/development/libraries/glib-networking/default.nix
View File

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

@ -3719,6 +3719,8 @@ let
glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { }; glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { };
glib_networking = callPackage ../development/libraries/glib-networking {};
atk = callPackage ../development/libraries/atk/2.2.x.nix { }; atk = callPackage ../development/libraries/atk/2.2.x.nix { };
atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
@ -7450,10 +7452,10 @@ let
uwimap = callPackage ../tools/networking/uwimap { }; uwimap = callPackage ../tools/networking/uwimap { };
uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
inherit pkgconfig webkit makeWrapper; inherit pkgconfig webkit makeWrapper glib_networking;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit (xlibs) libX11 kbproto; inherit (xlibs) libX11 kbproto;
inherit (gnome) glib_networking libsoup; inherit (gnome) libsoup;
}; };
valknut = callPackage ../applications/networking/p2p/valknut { }; valknut = callPackage ../applications/networking/p2p/valknut { };
@ -8589,9 +8591,7 @@ let
vice = callPackage ../misc/emulators/vice { }; vice = callPackage ../misc/emulators/vice { };
vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
inherit stdenv fetchurl makeWrapper perl pkgconfig webkit gtk; inherit (gnome) libsoup;
inherit (xlibs) libX11;
inherit (gnome) libsoup glib_networking;
}; };
VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };