summary refs log tree commit diff
diff options
context:
space:
mode:
authormingchuan <ming@culpring.com>2016-10-21 17:39:43 +0800
committermingchuan <ming@culpring.com>2016-10-21 17:39:43 +0800
commit40d8b743f47255d09bab48c0ff81b44bc88404eb (patch)
tree1b8b6d42f891e2704fbe6871dfef037a022b40af
parent9b2fbb776b5a59be275271a6b45903b57f9cc3f0 (diff)
downloadnixpkgs-40d8b743f47255d09bab48c0ff81b44bc88404eb.tar
nixpkgs-40d8b743f47255d09bab48c0ff81b44bc88404eb.tar.gz
nixpkgs-40d8b743f47255d09bab48c0ff81b44bc88404eb.tar.bz2
nixpkgs-40d8b743f47255d09bab48c0ff81b44bc88404eb.tar.lz
nixpkgs-40d8b743f47255d09bab48c0ff81b44bc88404eb.tar.xz
nixpkgs-40d8b743f47255d09bab48c0ff81b44bc88404eb.tar.zst
nixpkgs-40d8b743f47255d09bab48c0ff81b44bc88404eb.zip
remmina: fix GSettings schemas not found error
Use gappWrapper to wrap the program so that remmina can find GSettings schemas.
-rw-r--r--pkgs/applications/networking/remote/remmina/default.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 90c80db0a02..2b157604f48 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook
 , glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11
 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
 , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
   };
 
-  buildInputs = [ cmake pkgconfig makeWrapper
+  buildInputs = [ cmake pkgconfig wrapGAppsHook
                   glib gtk3 gettext libxkbfile libgnome_keyring libX11
                   freerdp_git libssh libgcrypt gnutls
                   pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
@@ -55,10 +55,15 @@ stdenv.mkDerivation {
 
   cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
+    )
+  '';
+
   postInstall = ''
     mkdir -pv $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
-    wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
   '';
 
   meta = with stdenv.lib; {