diff options
author | Ryan Orendorff <56783407+orendorff-mi@users.noreply.github.com> | 2019-12-18 09:32:32 +0800 |
---|---|---|
committer | Renaud <c0bw3b@users.noreply.github.com> | 2019-12-18 02:32:32 +0100 |
commit | 797b706daf2ac6223f8d15220fa86376fceb24ec (patch) | |
tree | 182b08625ace1d3a1df86e83cae1474110547a85 /pkgs/applications/misc/barrier | |
parent | dae6544457901efcc458801b771da768e92cc8a4 (diff) |
barrier: add openssl runtime dependency (#75490)
* barrier: add openssl runtime dependency The barrier GUI creates an SSL certificate at runtime using OpenSSL. We add openssl to the path to enable this feature. * barrier: fix GLib-GIO-ERROR rg.gtk.Settings.FileChooser 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 * barrier: move cmake buildInputs to nativeBuildInputs
Diffstat (limited to 'pkgs/applications/misc/barrier')
-rw-r--r-- | pkgs/applications/misc/barrier/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index d8325e19e2664..10e46176c6e6e 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, + openssl, wrapGAppsHook, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: @@ -13,12 +14,17 @@ mkDerivation rec { sha256 = "1gbg3p7c0vcsdzsjj1ssx6k8xpj3rpyvais12266f0xvnbvihczd"; }; - buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; + buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; + nativeBuildInputs = [ cmake wrapGAppsHook ]; postFixup = '' substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" ''; + qtWrapperArgs = [ + ''--prefix PATH : ${stdenv.lib.makeBinPath [ openssl ]}'' + ]; + meta = { description = "Open-source KVM software"; longDescription = '' |