diff --git a/pkgs/data/misc/gsettings-desktop-schemas/default.nix b/pkgs/data/misc/gsettings-desktop-schemas/default.nix deleted file mode 100644 index c934863d75d..00000000000 --- a/pkgs/data/misc/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 97c4fe336b2..47dbd545379 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -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 ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7fd31644b3..a38aad96a84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };