From b80925a19e1d3e9c7d45a5489f152be3540825b6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 14 Apr 2014 13:25:55 +0200 Subject: [PATCH] empathy: find gsettings schemas, enable in gnome3, disable parallel build Enabling by default on gnome3 as now it's possible to create and use accounts (tested with telepathy_gabble and gtalk). At this time, empathy x86-64 fails to build on hydra but I'm unable to reproduce. Therefore, try disabling the parallel build. --- .../modules/services/x11/desktop-managers/gnome3.nix | 1 + pkgs/desktops/gnome-3/core/empathy/default.nix | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 54bc85246076..6b7818519cf5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -87,6 +87,7 @@ in { gnome3.gnome_themes_standard ] ++ (removePackagesByName [ gnome3.baobab + gnome3.empathy gnome3.eog gnome3.epiphany gnome3.evince diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index a227c1422d69..051bc9b7fb25 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -37,13 +37,12 @@ stdenv.mkDerivation rec { "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; - enableParallelBuilding = true; - preFixup = '' - wrapProgram "$out/bin/empathy" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - + for f in $out/bin/* $out/libexec/*; do + wrapProgram $f \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + done rm $out/share/icons/hicolor/icon-theme.cache '';