From 19a62322ea9a024db3167e53781a27b4816edb0d Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 28 Apr 2015 02:37:36 +0200 Subject: [PATCH] gnome3.16: dconf-editor is now a separate package --- .../3.16/core/dconf-editor/default.nix | 28 +++++++++++++++++++ .../gnome-3/3.16/core/dconf/default.nix | 7 ----- pkgs/desktops/gnome-3/3.16/default.nix | 3 +- 3 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix new file mode 100644 index 00000000000..06c01d305f8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 +, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: + +let + majorVersion = "3.16"; +in +stdenv.mkDerivation rec { + name = "dconf-editor-${version}"; + version = "${majorVersion}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/dconf-editor/${majorVersion}/${name}.tar.xz"; + sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88"; + }; + + buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ]; + + preFixup = '' + wrapProgram "$out/bin/dconf-editor" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix index 141d1413f6f..3f71165e713 100644 --- a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix @@ -16,13 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - preFixup = '' - wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - rm $out/lib/gio/modules/giomodule.cache - ''; - meta = with stdenv.lib; { platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index b07a1192fb1..937d73b9421 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -16,7 +16,7 @@ rec { gnome-shell-extensions gnome-system-log gnome-system-monitor gnome_terminal gnome-user-docs bijiben evolution file-roller gedit gnome-clocks gnome-music gnome-tweak-tool gnome-photos - nautilus-sendto + nautilus-sendto dconf-editor ]; inherit (pkgs) libsoup glib gtk2; @@ -66,6 +66,7 @@ rec { caribou = callPackage ./core/caribou { }; dconf = callPackage ./core/dconf { }; + dconf-editor = callPackage ./core/dconf-editor { }; empathy = callPackage ./core/empathy { webkitgtk = webkitgtk24x;