public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19094 from ericsagnes/pkg-update/ibus

Browse Source 
ibus: 1.5.13 -> 1.5.14
This commit is contained in:
Thomas Tuegel 2016-09-30 09:18:40 -05:00 committed by GitHub
commit 65f44f3f3a
4 changed files with 2775 additions and 3083 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3127
pkgs/development/node-packages/node-packages-v4.nix
View File

File diff suppressed because it is too large Load Diff

2714
pkgs/development/node-packages/node-packages-v5.nix
View File

File diff suppressed because it is too large Load Diff

1
pkgs/development/node-packages/node-packages.json
View File

@ -12,6 +12,7 @@
, "elasticdump" , "elasticdump"
, "emoj" , "emoj"
, "eslint" , "eslint"
, "emojione"
, "fetch-bower" , "fetch-bower"
, "forever" , "forever"
, "git-run" , "git-run"

12
pkgs/tools/inputmethods/ibus/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, makeWrapper
, intltool, isocodes, pkgconfig , intltool, isocodes, pkgconfig
, python3, pygobject3 , python3, pygobject3
, gtk2, gtk3, atk, dconf, glib , gtk2, gtk3, atk, dconf, glib, json_glib
, dbus, libnotify, gobjectIntrospection, wayland , dbus, libnotify, gobjectIntrospection, wayland
, nodePackages
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ibus-${version}"; name = "ibus-${version}";
version = "1.5.13"; version = "1.5.14";
src = fetchurl { src = fetchurl {
url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz";
sha256 = "1wd5azlsgdih8qw6gi15rv130s6d90846n3r1ccwmp6z882xhwzd"; sha256 = "0g4x02d7j5w1lfn4zvmzsq93h17lajgn9d7hlvr6pws28vz40ax4";
}; };
postPatch = '' postPatch = ''
@ -29,12 +30,14 @@ stdenv.mkDerivation rec {
"--disable-memconf" "--disable-memconf"
"--enable-ui" "--enable-ui"
"--enable-python-library" "--enable-python-library"
"--with-emoji-json-file=${nodePackages.emojione}/lib/node_modules/emojione/emoji.json"
]; ];
buildInputs = [ buildInputs = [
python3 pygobject3 python3 pygobject3
intltool isocodes pkgconfig intltool isocodes pkgconfig
gtk2 gtk3 dconf gtk2 gtk3 dconf
json_glib
dbus libnotify gobjectIntrospection wayland dbus libnotify gobjectIntrospection wayland
]; ];
@ -64,6 +67,9 @@ stdenv.mkDerivation rec {
done done
''; '';
doInstallCheck = true;
installCheckPhase = "$out/bin/ibus version";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/ibus/ibus; homepage = https://github.com/ibus/ibus;
description = "Intelligent Input Bus for Linux / Unix OS"; description = "Intelligent Input Bus for Linux / Unix OS";