diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-08 16:49:08 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-08 16:49:08 +0000 |
commit | 1a62d14cdd99126ac407bb2a54f6dde862863803 (patch) | |
tree | f300f45c0e1b2e595c2dd132a0070ebfcf640dce /pkgs | |
parent | 46b258acb4e0f8566f77acbe3567043f434f6c43 (diff) | |
download | nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.gz nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.bz2 nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.lz nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.xz nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.tar.zst nixlib-1a62d14cdd99126ac407bb2a54f6dde862863803.zip |
Move glib-networking to top namespace
svn path=/nixpkgs/trunk/; revision=32905
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/glib-networking/default.nix (renamed from pkgs/desktops/gnome-2/platform/glib-networking/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
3 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 814b054f74e7..f0c1006a1265 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -60,8 +60,6 @@ at_spi = callPackage ./platform/at-spi { }; - glib_networking = callPackage ./platform/glib-networking { }; - gtk_doc = callPackage ./platform/gtk-doc { }; gtkhtml = callPackage ./platform/gtkhtml { }; diff --git a/pkgs/desktops/gnome-2/platform/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 53ab1ba08406..53ab1ba08406 100644 --- a/pkgs/desktops/gnome-2/platform/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a5dc7008bad..b87f9e276ecc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3719,6 +3719,8 @@ let 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 { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; @@ -7450,10 +7452,10 @@ let uwimap = callPackage ../tools/networking/uwimap { }; uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { - inherit pkgconfig webkit makeWrapper; + inherit pkgconfig webkit makeWrapper glib_networking; inherit (gtkLibs) gtk glib; inherit (xlibs) libX11 kbproto; - inherit (gnome) glib_networking libsoup; + inherit (gnome) libsoup; }; valknut = callPackage ../applications/networking/p2p/valknut { }; @@ -8589,9 +8591,7 @@ let vice = callPackage ../misc/emulators/vice { }; vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { - inherit stdenv fetchurl makeWrapper perl pkgconfig webkit gtk; - inherit (xlibs) libX11; - inherit (gnome) libsoup glib_networking; + inherit (gnome) libsoup; }; VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; |