From 12d081f78759f76bcdf4d431e348d4b7ddba52bc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 19 Dec 2017 02:46:32 +0100 Subject: [PATCH] =?UTF-8?q?libskk:=201.0.2=20=E2=86=92=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libskk/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index fc5b41ac607f..5e36d0688694 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, fetchFromGitHub, - libtool, intltool, pkgconfig, + libtool, gettext, pkgconfig, vala, gnome_common, gobjectIntrospection, - libgee_0_8, json_glib, skk-dicts }: + libgee, json_glib, skk-dicts }: stdenv.mkDerivation rec { name = "libskk-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "ueno"; repo = "libskk"; - rev = "6a232e75de6d5dbe543ab17c9b85dc7560093509"; - sha256 = "1xa9akf95jyi4laiw1llnjdpfq5skhidm7dnkd0i0ds6npzzqnxc"; + rev = version; + sha256 = "092bjir866f350s4prq9q0yg34s91vmr8wbgf2vh3kcax1yj1axm"; }; buildInputs = [ skk-dicts ]; - nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool intltool pkgconfig ]; - propagatedBuildInputs = [ libgee_0_8 json_glib ]; + nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ]; + propagatedBuildInputs = [ libgee json_glib ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cea7a7478add..e4d465e4c5b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1529,8 +1529,7 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - gnome_common = gnome3.gnome_common; - vala = vala_0_34; + inherit (gnome3) gnome_common libgee; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { };