From 75f6aca38b59b6ba958069b32500325ddb3be875 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 15 May 2024 09:25:03 +0200 Subject: [PATCH] remmina: only use fuse on linux systems fuse is used in FreeRDP and now needs to be included[1] in remmina. This breaks darwin and is only used for file clipboard on linux[2]. This commit also fixes a compiler error due to some upstream refactoring. [1]: https://gitlab.com/Remmina/Remmina/-/issues/3039 [2]: https://github.com/FreeRDP/FreeRDP/blob/5bc74f43c8a95728b8d50eb54c750d18ab732e45/docs/README.building#L111 Signed-off-by: Florian Brandes --- .../networking/remote/remmina/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a754fcb33f29..d80850edd446 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3 -, curl, fuse3 +, curl, fuse3, fetchpatch2 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 , freerdp3, libssh, libgcrypt, gnutls, vte @@ -26,11 +26,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM="; }; + patches = [ + (fetchpatch2 { + name = "add-a-conditional-check-for-darwin-and-NetBSD.patch"; + url = "https://gitlab.com/Remmina/Remmina/-/commit/3b681398c823e070c7f780166b9d9fc2158e66c1.diff"; + hash = "sha256-Ovdrsl9bftXiuXV+sqvDP9VGuXQZzC5VKOmkYmBXhNA="; + }) + ]; + nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ - curl fuse3 + curl gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 freerdp3 libssh libgcrypt gnutls @@ -42,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { openssl gnome.adwaita-icon-theme json-glib libsodium harfbuzz python3 wayland - ] ++ lib.optionals stdenv.isLinux [ libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] + ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] ++ lib.optionals withVte [ vte ];