diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-10-19 19:14:25 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-10-19 19:14:25 +0000 |
commit | 972ec8b3bee60ba3ecc429f06ad3f448cea30385 (patch) | |
tree | 364969f203e605d60d8e6368aee0c39d4a63906f /pkgs/applications/networking/remote/remmina/default.nix | |
parent | 8ec632271108a9e74c11a48da9305b7ba9711166 (diff) | |
download | nixpkgs-972ec8b3bee60ba3ecc429f06ad3f448cea30385.tar nixpkgs-972ec8b3bee60ba3ecc429f06ad3f448cea30385.tar.gz nixpkgs-972ec8b3bee60ba3ecc429f06ad3f448cea30385.tar.bz2 nixpkgs-972ec8b3bee60ba3ecc429f06ad3f448cea30385.tar.lz nixpkgs-972ec8b3bee60ba3ecc429f06ad3f448cea30385.tar.xz nixpkgs-972ec8b3bee60ba3ecc429f06ad3f448cea30385.tar.zst nixpkgs-972ec8b3bee60ba3ecc429f06ad3f448cea30385.zip |
remmina: make gnome support optional
There's no runtime option to disable GNOME stuff, and storing things in GNOME Keyring is very inconvenient for non-GNOME users.
Diffstat (limited to 'pkgs/applications/networking/remote/remmina/default.nix')
-rw-r--r-- | pkgs/applications/networking/remote/remmina/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 91c33c632b8..1bb38fc61f6 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 +, glib, gtk3, gettext, libxkbfile, libX11 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , pcre, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon @@ -7,8 +7,11 @@ , 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 desktopItem = makeDesktopItem { @@ -34,12 +37,18 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas - glib gtk3 gettext libxkbfile libgnome-keyring libX11 + 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 ]; + 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 +71,7 @@ in stdenv.mkDerivation rec { 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+"; |