From 23ccdd979aafafc7443dc844d4a15e3392ef3bc9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 19 May 2014 22:06:18 +0200 Subject: [PATCH] gnome-terminal: disable migration from gconf to gsettings --- .../desktops/gnome-3/3.12/core/gnome-terminal/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix index 2c4b838ad8b8..17731444f005 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, gconf, libuuid +, gnome_doc_utils, intltool, libX11, which, libuuid , desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }: stdenv.mkDerivation rec { @@ -15,15 +15,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ]; + gnome3.dconf itstool ncurses makeWrapper ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; # FIXME: enable for gnome3 - configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" ]; + configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" "--disable-migration" ]; preFixup = '' - for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do + for f in "$out/libexec/gnome-terminal-server"; do wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" done '';