From b113433d51f5b1df076823deb6183c36789b1031 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 19 Mar 2012 04:36:47 +0000 Subject: [PATCH] Move libwnck to top-level svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33253 --- pkgs/desktops/gnome-2/default.nix | 2 -- .../desktop => development/libraries}/libwnck/default.nix | 0 pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{desktops/gnome-2/desktop => development/libraries}/libwnck/default.nix (100%) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 661311b3014..4a4e6eaaefb 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -71,8 +71,6 @@ gnome_keyring = callPackage ./desktop/gnome-keyring { }; - libwnck = callPackage ./desktop/libwnck { }; - libgweather = callPackage ./desktop/libgweather { }; gvfs = callPackage ./desktop/gvfs { }; diff --git a/pkgs/desktops/gnome-2/desktop/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix similarity index 100% rename from pkgs/desktops/gnome-2/desktop/libwnck/default.nix rename to pkgs/development/libraries/libwnck/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7db4e25bf8e..5adbe6efc24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4243,6 +4243,8 @@ let libwmf = callPackage ../development/libraries/libwmf { }; + libwnck = callPackage ../development/libraries/libwnck { }; + libwpd = callPackage ../development/libraries/libwpd { }; libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { }; @@ -7893,7 +7895,7 @@ let self = pkgs.gnome2; } // pkgs.gtkLibs // { # Backwards compatibility; - inherit (pkgs) libsoup gtk_doc gnome_doc_utils; + inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; gnome = recurseIntoAttrs gnome2;