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

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

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

Ryan Orendorff
The barrier GUI creates an SSL certificate at runtime using OpenSSL. We add
openssl to the path to enable this feature.
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
Copy link
Contributor

@phryneas phryneas left a comment

Looks sensible to me.

cmake is only needed at build time.
@ofborg ofborg bot requested a review from phryneas Dec 17, 2019
@c0bw3b
c0bw3b approved these changes Dec 18, 2019
@c0bw3b c0bw3b merged commit 797b706 into NixOS:master Dec 18, 2019
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
barrier on aarch64-linux Success
Details
barrier on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ghost ghost deleted the openssl-for-barrier-kvm branch Dec 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.