diff options
Diffstat (limited to 'pkgs/applications/networking/remote/remmina/default.nix')
-rw-r--r-- | pkgs/applications/networking/remote/remmina/default.nix | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 0fd2de49dac3e..d80850edd4466 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3 +, curl, fuse3, fetchpatch2 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 -, freerdp, libssh, libgcrypt, gnutls, vte +, freerdp3, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core @@ -16,22 +17,31 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.33"; + version = "1.4.35"; src = fetchFromGitLab { - owner = "Remmina"; - repo = "Remmina"; - rev = "v.${finalAttrs.version}"; - sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk="; + owner = "Remmina"; + repo = "Remmina"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM="; }; - nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ] + 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 gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 - freerdp libssh libgcrypt gnutls + freerdp3 libssh libgcrypt gnutls pcre2 libvncserver libpthreadstubs libXdmcp libxkbcommon libsoup_3 spice-protocol @@ -40,21 +50,18 @@ 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 ]; cmakeFlags = [ + "-DWITH_FREERDP3=ON" "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2${stdenv.hostPlatform.extensions.sharedLibrary}" - "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" ] ++ lib.optionals stdenv.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" "-DWITH_CUPS=OFF" @@ -82,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; + changelog = "https://gitlab.com/Remmina/Remmina/-/blob/master/CHANGELOG.md#${lib.replaceStrings ["."] [""] finalAttrs.src.rev}"; description = "Remote desktop client written in GTK"; mainProgram = "remmina"; maintainers = with maintainers; [ bbigras melsigl ryantm ]; |