Author: urkud
Date: Mon Mar 19 04:36:47 2012
New Revision: 33253
URL: https://nixos.org/websvn/nix/?rev=33253&sc=1
Log:
Move libwnck to top-level
Added:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/libwnck/
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/libwnck/default.nix
- copied, changed from r33252,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/libwnck/default.nix
Deleted:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/libwnck/
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix
nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix Mon Mar
19 04:36:41 2012 (r33252)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/default.nix Mon Mar
19 04:36:47 2012 (r33253)
@@ -71,8 +71,6 @@
gnome_keyring = callPackage ./desktop/gnome-keyring { };
- libwnck = callPackage ./desktop/libwnck { };
-
libgweather = callPackage ./desktop/libgweather { };
gvfs = callPackage ./desktop/gvfs { };
Copied and modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/libwnck/default.nix
(from r33252,
nixpkgs/branches/glib-2.30-take2/pkgs/desktops/gnome-2/desktop/libwnck/default.nix)
==============================================================================
Modified: nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Mon Mar
19 04:36:41 2012 (r33252)
+++ nixpkgs/branches/glib-2.30-take2/pkgs/top-level/all-packages.nix Mon Mar
19 04:36:47 2012 (r33253)
@@ -4243,6 +4243,8 @@
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 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
