From 797b706daf2ac6223f8d15220fa86376fceb24ec Mon Sep 17 00:00:00 2001
From: Ryan Orendorff <56783407+orendorff-mi@users.noreply.github.com>
Date: Wed, 18 Dec 2019 09:32:32 +0800
Subject: 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
---
 pkgs/applications/misc/barrier/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
index d8325e19e26..10e46176c6e 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 = ''
-- 
cgit 1.4.1