public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

barrier: add openssl runtime dependency (#75490)

Browse Source 
* 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
This commit is contained in:
Ryan Orendorff 2019-12-18 09:32:32 +08:00 committed by Renaud
parent dae6544457
commit 797b706daf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/barrier/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, { stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
openssl, wrapGAppsHook,
avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
}: }:
@ -13,12 +14,17 @@ mkDerivation rec {
sha256 = "1gbg3p7c0vcsdzsjj1ssx6k8xpj3rpyvais12266f0xvnbvihczd"; 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 = '' postFixup = ''
substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
''; '';
qtWrapperArgs = [
''--prefix PATH : ${stdenv.lib.makeBinPath [ openssl ]}''
];
meta = { meta = {
description = "Open-source KVM software"; description = "Open-source KVM software";
longDescription = '' longDescription = ''