From c600f5af25dbe95c1457e5bc4322ab284d4417cf Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 28 Apr 2015 02:35:43 +0200 Subject: [PATCH 1/2] gnome3: move definition of package sets into pkgs --- .../services/x11/desktop-managers/gnome3.nix | 49 +------------------ pkgs/desktops/gnome-3/3.12/default.nix | 18 +++++++ pkgs/desktops/gnome-3/3.16/default.nix | 18 +++++++ 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c951f3eae77a..d53f119c9558 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -132,53 +132,8 @@ in { environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" "${gnome3.glib_networking}/lib/gio/modules" "${gnome3.gvfs}/lib/gio/modules" ]; - environment.systemPackages = - [ pkgs.desktop_file_utils - gnome3.glib_networking - gnome3.gtk3 # for gtk-update-icon-cache - pkgs.ibus - pkgs.shared_mime_info # for update-mime-database - gnome3.gvfs - gnome3.dconf - gnome3.gnome-backgrounds - gnome3.gnome_control_center - gnome3.gnome-menus - gnome3.gnome_settings_daemon - gnome3.gnome_shell - gnome3.gnome_themes_standard - gnome3.defaultIconTheme - ] ++ cfg.sessionPath ++ (removePackagesByName [ - gnome3.baobab - gnome3.empathy - gnome3.eog - gnome3.epiphany - gnome3.evince - gnome3.gucharmap - gnome3.nautilus - gnome3.totem - gnome3.vino - gnome3.yelp - gnome3.gnome-bluetooth - gnome3.gnome-calculator - gnome3.gnome-contacts - gnome3.gnome-font-viewer - gnome3.gnome-screenshot - gnome3.gnome-shell-extensions - gnome3.gnome-system-log - gnome3.gnome-system-monitor - gnome3.gnome_terminal - gnome3.gnome-user-docs - - gnome3.bijiben - gnome3.evolution - gnome3.file-roller - gnome3.gedit - gnome3.gnome-clocks - gnome3.gnome-music - gnome3.gnome-tweak-tool - gnome3.gnome-photos - gnome3.nautilus-sendto - ] config.environment.gnome3.excludePackages); + environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath + ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages); # Use the correct gnome3 packageSet networking.networkmanager.basePackages = diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index dce75eb2176d..670ceb105af3 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -1,6 +1,24 @@ { callPackage, pkgs }: rec { + corePackages = with gnome3; [ + pkgs.desktop_file_utils pkgs.ibus + pkgs.shared_mime_info # for update-mime-database + gtk3 # for gtk-update-icon-cache + glib_networking gvfs dconf gnome-backgrounds gnome_control_center + gnome-menus gnome_settings_daemon gnome_shell + gnome_themes_standard defaultIconTheme + ]; + + optionalPackages = with gnome3; [ baobab empathy eog epiphany evince + gucharmap nautilus totem vino yelp gnome-bluetooth + gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot + 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 + ]; + inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index a26b5263dcda..b07a1192fb13 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -1,6 +1,24 @@ { callPackage, pkgs, self }: rec { + corePackages = with gnome3; [ + pkgs.desktop_file_utils pkgs.ibus + pkgs.shared_mime_info # for update-mime-database + gtk3 # for gtk-update-icon-cache + glib_networking gvfs dconf gnome-backgrounds gnome_control_center + gnome-menus gnome_settings_daemon gnome_shell + gnome_themes_standard defaultIconTheme + ]; + + optionalPackages = with gnome3; [ baobab empathy eog epiphany evince + gucharmap nautilus totem vino yelp gnome-bluetooth + gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot + 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 + ]; + inherit (pkgs) libsoup glib gtk2; inherit (pkgs.gnome2) ORBit2; gtk3 = pkgs.gtk3_16; From 19a62322ea9a024db3167e53781a27b4816edb0d Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 28 Apr 2015 02:37:36 +0200 Subject: [PATCH 2/2] 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 000000000000..06c01d305f84 --- /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 141d1413f6f1..3f71165e7133 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 b07a1192fb13..937d73b9421c 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;