update gsettings-desktop-schemas and make system-wide

Conflicts:
	pkgs/data/misc/gsettings-desktop-schemas/default.nix
	pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
This commit is contained in:
Vladimír Čunát 2013-02-21 20:42:28 +01:00
parent 51a413ac1c
commit bf4313cd88
3 changed files with 7 additions and 26 deletions

View file

@ -1,17 +0,0 @@
{ stdenv, fetchurl, glib, pkgconfig, intltool }:
stdenv.mkDerivation {
name = "gsettings-desktop-schemas-3.2.0";
src = fetchurl {
url = mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz;
sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi";
};
buildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = {
inherit (glib.meta) maintainers platforms;
};
}

View file

@ -1,21 +1,19 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
, gnome_doc_utils, intltool, libX11, which }:
{ stdenv, fetchurl, pkgconfig, intltool, glib }:
stdenv.mkDerivation rec {
versionMajor = "3.5";
versionMinor = "3";
versionMajor = "3.6";
versionMinor = "1";
moduleName = "gsettings-desktop-schemas";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0vxbpwqvm55a4ssaddfsw2jy0q8bvsv8wbjps4yyyi9iykfylwli";
sha256 = "1rk71q2rky9nzy0zb5jsvxa62vhg7dk65kdgdifq8s761797ga6r";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ gnome3.glib libxml2 libxslt libX11 ];
buildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
nativeBuildInputs = [ pkgconfig intltool ];
}

View file

@ -6425,7 +6425,7 @@ let
gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas {};
inherit (gnome3) gsettings_desktop_schemas;
hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };