gnome3.gnome-terminal: clean up

This commit is contained in:
Jan Tojnar 2018-08-08 03:29:49 +02:00
parent 42eca7ca2d
commit 0c9273509a
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3
, gnome-doc-utils, intltool, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }:
{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "gnome-terminal-${version}";
@ -11,15 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-terminal"; attrPath = "gnome3.gnome-terminal"; };
};
buildInputs = [
gtk gsettings-desktop-schemas vte libuuid dconf
# For extension
nautilus
];
buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools
gnome3.dconf itstool gnome3.nautilus ];
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which libuuid libxml2
vala desktop-file-utils wrapGAppsHook ];
nativeBuildInputs = [
pkgconfig intltool itstool which libxml2
vala desktop-file-utils wrapGAppsHook
];
# Silly ./configure, it looks for dbus file from gnome-shell in the
# installation tree of the package it is configuring.
@ -28,15 +29,22 @@ stdenv.mkDerivation rec {
substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
'';
# FIXME: enable for gnome3
configureFlags = [ "--disable-migration" ];
configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30
passthru = {
updateScript = gnome3.updateScript {
packageName = "gnome-terminal";
attrPath = "gnome3.gnome-terminal";
};
};
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "The GNOME Terminal Emulator";
homepage = https://wiki.gnome.org/Apps/Terminal/;
homepage = https://wiki.gnome.org/Apps/Terminal;
platforms = platforms.linux;
license = licenses.gpl3Plus;
maintainers = gnome3.maintainers;
};
}