Author: urkud
Date: Sat Jan 7 19:51:27 2012
New Revision: 31421
URL: https://nixos.org/websvn/nix/?rev=31421&sc=1
Log:
Move gsettings-desktop-schemas to data/misc
Added:
nixpkgs/branches/glib-2.30/pkgs/data/misc/gsettings-desktop-schemas/
nixpkgs/branches/glib-2.30/pkgs/data/misc/gsettings-desktop-schemas/default.nix
- copied, changed from r31420,
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/platform/gsettings-desktop-schemas/default.nix
Deleted:
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/platform/gsettings-desktop-schemas/
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix
Modified:
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/default.nix
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-3/default.nix
nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/branches/glib-2.30/pkgs/data/misc/gsettings-desktop-schemas/default.nix
(from r31420,
nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/platform/gsettings-desktop-schemas/default.nix)
==============================================================================
Modified: nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/default.nix Sat Jan
7 19:43:32 2012 (r31420)
+++ nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-2/default.nix Sat Jan
7 19:51:27 2012 (r31421)
@@ -15,8 +15,6 @@
esound = callPackage ./platform/esound { };
- gsettings_desktop_schemas = callPackage ./platform/gsettings-desktop-schemas
{ };
-
libIDL = callPackage ./platform/libIDL {
gettext = if stdenv.isDarwin then gettext else null;
};
Modified: nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-3/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-3/default.nix Sat Jan
7 19:43:32 2012 (r31420)
+++ nixpkgs/branches/glib-2.30/pkgs/desktops/gnome-3/default.nix Sat Jan
7 19:51:27 2012 (r31421)
@@ -14,8 +14,6 @@
libsoup = callPackage ./platform/libsoup.nix { };
- gsettings_desktop_schemas = callPackage
./platform/gsettings-desktop-schemas.nix {};
-
GConf = callPackage ./platform/GConf.nix { };
gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
Modified: nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix Sat Jan 7
19:43:32 2012 (r31420)
+++ nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix Sat Jan 7
19:51:27 2012 (r31421)
@@ -6250,6 +6250,8 @@
gentium = callPackage ../data/fonts/gentium {};
+ gsettings_desktop_schemas = callPackage
../data/misc/gsettings-desktop-schemas { };
+
hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
inconsolata = callPackage ../data/fonts/inconsolata {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
