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 similarity index 100% rename from pkgs/desktops/gnome-2/platform/glib-networking/default.nix rename to 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 { };