pyrox.dev
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 <florian.brandes@posteo.de>
authored by Florian Brandes and committed by Sandro Jäckel 75f6aca3 81cd68e7
+11
-3
pkgs/applications/networking/remote/remmina/default.nix
+11
-3
pkgs/applications/networking/remote/remmina/default.nix
···
1
1
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3
2
-
, curl, fuse3
2
+
, curl, fuse3, fetchpatch2
3
3
, desktopToDarwinBundle
4
4
, glib, gtk3, gettext, libxkbfile, libX11, python3
5
5
, freerdp3, libssh, libgcrypt, gnutls, vte
···
26
26
hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM=";
27
27
};
28
28
29
+
patches = [
30
+
(fetchpatch2 {
31
+
name = "add-a-conditional-check-for-darwin-and-NetBSD.patch";
32
+
url = "https://gitlab.com/Remmina/Remmina/-/commit/3b681398c823e070c7f780166b9d9fc2158e66c1.diff";
33
+
hash = "sha256-Ovdrsl9bftXiuXV+sqvDP9VGuXQZzC5VKOmkYmBXhNA=";
34
+
})
35
+
];
36
+
29
37
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ]
30
38
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
31
39
32
40
buildInputs = [
33
-
curl fuse3
41
+
curl
34
42
gsettings-desktop-schemas
35
43
glib gtk3 gettext libxkbfile libX11
36
44
freerdp3 libssh libgcrypt gnutls
···
42
50
openssl gnome.adwaita-icon-theme json-glib libsodium
43
51
harfbuzz python3
44
52
wayland
45
-
] ++ lib.optionals stdenv.isLinux [ libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ]
53
+
] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ]
46
54
++ lib.optionals withLibsecret [ libsecret ]
47
55
++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ]
48
56
++ lib.optionals withVte [ vte ];