From 5fae4f32fdfba5df5eec2fd300b17bbad89196b2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 6 Oct 2017 22:05:01 +0200 Subject: [PATCH] =?UTF-8?q?deepin-terminal:=202.3.3=20=E2=86=92=202.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/deepin-terminal/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 0ee52b740f24..7f38e801c4cb 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,21 +1,22 @@ -{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, gee, wnck, gettext, libsecret, json_glib }: +{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; - version = "2.3.3"; + version = "2.6.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "0qam34g1rannv8kvw1zbps763a9ii9vbrkxyxxdk737hlpxdzg8h"; + sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b"; }; patchPhase = '' substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ]; + + nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ]; + buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ]; meta = { description = "The default terminal emulation for Deepin"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61036ae4f827..5fdfd7e2afbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16844,9 +16844,9 @@ with pkgs; }; deepin-terminal = callPackage ../applications/misc/deepin-terminal { - vte = gnome3.vte; + inherit (gnome3) libgee vte; wnck = libwnck3; - gee = libgee_0_8; + vala = vala_0_34; }; termite = callPackage ../applications/misc/termite {