Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ibus-engines.rime #87735

Merged
merged 2 commits into from Dec 2, 2020
Merged

Add ibus-engines.rime #87735

merged 2 commits into from Dec 2, 2020

Conversation

pmeiyu
Copy link
Member

@pmeiyu pmeiyu commented May 13, 2020 •
edited

Motivation for this change

This pull request adds ibus-engines.rime.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@SuperSandro2000
Copy link
Member

@pmeiyu please solve the merge conflict.

@pmeiyu pmeiyu force-pushed the master branch 2 times, most recently from ec006c0 to 16928ea Compare November 29, 2020 04:57
@pmeiyu
Copy link
Member Author

pmeiyu commented Nov 29, 2020

@SuperSandro2000 I have rebased the code onto master branch. You can merge now. Thanks.

@pmeiyu
Copy link
Member Author

pmeiyu commented Dec 1, 2020

@SuperSandro2000 Are you a merge conflict detection bot? This repository is full of useless bots.

@pmeiyu
Copy link
Member Author

pmeiyu commented Dec 1, 2020

@SuperSandro2000 Bad bot. Waste my time. Please notify me only when you are actually going to review the code.

@eyJhb
Copy link
Member

eyJhb commented Dec 1, 2020

Result of nixpkgs-review pr 87735 1

1 package blacklisted:
  • tests.nixos-functions.nixos-test
1 package built:
  • ibus-engines.rime

@pmeiyu pmeiyu force-pushed the master branch 2 times, most recently from d3fa25f to d90b4a5 Compare December 1, 2020 10:03
@jtojnar jtojnar mentioned this pull request Dec 1, 2020
Closed
10 tasks
jtojnar
jtojnar reviewed Dec 1, 2020
View reviewed changes
pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix Outdated Show resolved Hide resolved
pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
Comment on lines +22 to +23
substituteInPlace Makefile \
--replace 'cmake' 'cmake -DRIME_DATA_DIR=${brise}/share/rime-data'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to specify this in cmakeFlags, see https://github.com/NixOS/nixpkgs/pull/77877/files#diff-22b83f2a09917d6f17fa4fb028cd36fd499c7d046298d46202d60a2fea4dde9fR39-R43

in combination with #77877 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ibus-rime project used a weird mixture of Makefile and cmake. I choose to use the make build system here. Therefore I have to patch Makefile. The other PR used cmake build system and that caused other dirt hacks. I think using Makefile is cleaner here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue with this is that it steps around the flags we pass to CMake like cmakeBuildType. I have opened rime/ibus-rime#112 to allow us to use CMake for everything, including correct paths in the files.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. So this will be resolved in next ibus-rime release.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 87735 run on x86_64-linux 1

1 package blacklisted:
  • tests.nixos-functions.nixos-test
1 package built:
  • ibus-engines.rime

@SuperSandro2000 SuperSandro2000 merged commit 6f52d0f into NixOS:master Dec 2, 2020
@oxalica oxalica mentioned this pull request Mar 24, 2021
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@pmeiyu @SuperSandro2000 @eyJhb @jtojnar @Janik-Haag