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

barrier: add openssl runtime dependency #75490

Merged
merged 3 commits into from Dec 18, 2019
Merged

barrier: add openssl runtime dependency #75490

merged 3 commits into from Dec 18, 2019

Conversation

ghost
Copy link

@ghost ghost commented Dec 11, 2019 •
edited by ghost

The barrier GUI creates an SSL certificate at runtime using OpenSSL. We add
openssl to the path to enable this feature.

Motivation for this change

When launching barrier, the GUI attempts to create an SSL certificate. Previously, you would need to have openssl on the path in order to get the barrier program to create this certificate (say through nix-shell -p barrier -p openssl). This change adds openssl to the path of the barrier wrapper script so that the openssl dependency is defined.

Additionally, a bug in saving the configuration settings when in the server mode was fixed by adding the wrapGAppsHook nativeBuildInput.

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 nix-review --run "nix-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.
Notify maintainers

cc @phryneas

barrier: add openssl runtime dependency
76dce0f 
The barrier GUI creates an SSL certificate at runtime using OpenSSL. We add
openssl to the path to enable this feature.
@ofborg ofborg bot requested a review from phryneas December 11, 2019 11:09
barrier: fix GLib-GIO-ERROR rg.gtk.Settings.FileChooser
410a38e 
When you use the Barrier menu item in the GUI to save the configuration, the
program crashes. wrapGAppsHook fixes this issue.

Error was:
GLib-GIO-ERROR **: 19:03:29.155: Settings schema 'org.gtk.Settings.FileChooser' does not contain a key nixos
phryneas
phryneas approved these changes Dec 11, 2019
View reviewed changes
Copy link
Member

@phryneas phryneas left a comment

Choose a reason for hiding this comment

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

Looks sensible to me.

barrier: move cmake buildInputs to nativeBuildInputs
d90a97c 
cmake is only needed at build time.
@ofborg ofborg bot requested a review from phryneas December 17, 2019 23:59
@c0bw3b c0bw3b merged commit 797b706 into NixOS:master Dec 18, 2019
@ghost ghost deleted the openssl-for-barrier-kvm branch December 18, 2019 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phryneas phryneas Awaiting requested review from phryneas

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@phryneas @c0bw3b