diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 96aa037d35b..e823977db20 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 +, glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem -, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 +, pcre, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib # The themes here are soft dependencies; only icons are missing without them. , hicolor-icon-theme, adwaita-icon-theme +, gnomeSupport ? true, libgnome-keyring }: +with stdenv.lib; + let - version = "1.2.32"; desktopItem = makeDesktopItem { name = "remmina"; @@ -22,8 +24,9 @@ let categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { name = "remmina-${version}"; + version = "1.2.32"; src = fetchFromGitLab { owner = "Remmina"; @@ -33,13 +36,21 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas - glib gtk3 gettext libxkbfile libgnome-keyring libX11 - freerdp libssh libgcrypt gnutls - pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 - libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret spice-protocol spice-gtk epoxy at-spi2-core - openssl hicolor-icon-theme adwaita-icon-theme json-glib ]; + buildInputs = [ + cmake wrapGAppsHook gsettings-desktop-schemas + glib gtk3 gettext libxkbfile libX11 + freerdp libssh libgcrypt gnutls + pcre libdbusmenu-gtk3 libappindicator-gtk3 + libvncserver libpthreadstubs libXdmcp libxkbcommon + libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core + openssl hicolor-icon-theme adwaita-icon-theme json-glib + ] + ++ optional gnomeSupport libgnome-keyring; + + preConfigure = optionalString (!gnomeSupport) '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(remmina-plugins-gnome)" "" + ''; cmakeFlags = [ "-DWITH_VTE=OFF" @@ -62,7 +73,7 @@ in stdenv.mkDerivation { cp ${desktopItem}/share/applications/* $out/share/applications ''; - meta = with stdenv.lib; { + meta = { license = stdenv.lib.licenses.gpl2; homepage = https://gitlab.com/Remmina/Remmina; description = "Remote desktop client written in GTK+";