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.

Sign up for GitHub

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

Kgpg: Added gnupg1 as runtime dependency #25356

Merged
merged 3 commits into from May 2, 2017
Merged

Kgpg: Added gnupg1 as runtime dependency #25356

merged 3 commits into from May 2, 2017

Conversation

ghost
Copy link

@ghost ghost commented Apr 30, 2017

Motivation for this change

Like partially described in Issue #25286, kgpg need gnupg. In particular gnupg1, because the default path in the settings of kgpg is searching for gpg and results in an error on startup. Gnupg1 installs gpg2 and creates a symlinc for gpg.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@thineye, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ttuegel to be a potential reviewer.

@joachifm
Copy link
Contributor

propagatedBuildInputs is not the right tool for this job, it has to do with the build environment. Wrapping is a more common approach to making sure a given command is available at runtime.

@joachifm
Copy link
Contributor

propagatedUserEnvPkgs might be more appropriate, but similarly to propagatedBuildInputs it depends on the consumer having knowledge of that mechanism (like buildEnv).

@ghost
Copy link
Author

ghost commented Apr 30, 2017

Thanks for the hint. I am learning a lot from this. 👍
Now, I used the shell function wrapProgram to add the binary path of gnupg1 to kgpg.

@joachifm
Copy link
Contributor

joachifm commented May 1, 2017

LGTM :)

@ttuegel
Copy link
Member

ttuegel commented May 1, 2017

As this is a Qt-based program, please use makeQtWrapper and wrapQtProgram instead.

(In fact, it should already be using those, but I probably forgot to wrap it when it was upgraded from Qt 4 to Qt 5.)

@ghost
Copy link
Author

ghost commented May 1, 2017

Thanks. I changed it.
makeWrapper --> makeQtWrapper
wrapProgram --> wrapQtProgram

@joachifm joachifm merged commit e026fb4 into NixOS:master May 2, 2017
@ghost ghost deleted the fix/dep-kgpg-gnupg1 branch May 2, 2017 15:11
@ghost ghost mentioned this pull request May 2, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mention-bot @joachifm @ttuegel