Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5dcc65a25b6d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6aac40d24615
Choose a head ref
  • 4 commits
  • 1 file changed
  • 3 contributors

Commits on Aug 12, 2019

  1. ibus-engines.table: fix after update of settings infrastructure 

    Fixes #56621. Adds a wrapper to deal with gsettings, and includes a hack to make
things actually work (postFixup).
    @laMudri
    laMudri committed Aug 12, 2019
    Copy the full SHA
    ba21259 View commit details

Commits on Aug 19, 2019

  1. ibus-engines.table: remove hacky change to source code 

    Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
    @laMudri @jtojnar
    laMudri and jtojnar committed Aug 19, 2019
    Copy the full SHA
    549c146 View commit details

  2. ibus-engines.table: fit Python package name conventions

    @laMudri
    laMudri committed Aug 19, 2019
    Copy the full SHA
    8f93275 View commit details

Commits on Aug 20, 2019

  1. Merge pull request #61978 from laMudri/ibus-table 

    ibus-engines.table: fix after update of settings infrastructure
    @jtojnar
    jtojnar authored Aug 20, 2019
    Copy the full SHA
    6aac40d View commit details
Showing with 17 additions and 6 deletions.
  1. +17 −6 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
23 changes: 17 additions & 6 deletions pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, docbook2x, pkgconfig
, gtk3, dconf, gobject-introspection
, ibus, python3 }:
, ibus, python3, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "ibus-table-${version}";
pname = "ibus-table";
version = "1.9.21";

src = fetchFromGitHub {
@@ -30,18 +30,29 @@ stdenv.mkDerivation rec {
'';

buildInputs = [
dconf gtk3 gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ]))
dconf
gtk3
gobject-introspection
ibus
(python3.withPackages (pypkgs: with pypkgs; [
pygobject3
(toPythonModule ibus)
]))
];

nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ];
nativeBuildInputs = [
autoreconfHook
docbook2x
pkgconfig
python3.pkgs.wrapPython
wrapGAppsHook
];

postUnpack = ''
substituteInPlace $sourceRoot/engine/Makefile.am \
--replace "docbook2man" "docbook2man --sgml"
'';

postFixup = "wrapPythonPrograms";

meta = with stdenv.lib; {
isIbusEngine = true;
description = "An IBus framework for table-based input methods";