public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remmina: make gnome support optional

Browse Source 
There's no runtime option to disable GNOME stuff, and storing things in
GNOME Keyring is very inconvenient for non-GNOME users.
This commit is contained in:
Jan Malakhovski 2018-10-19 19:14:25 +00:00
parent 8ec6322711
commit 972ec8b3be
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook { stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , glib, gtk3, gettext, libxkbfile, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
, pcre, libdbusmenu-gtk3, libappindicator-gtk3 , pcre, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
@ -7,8 +7,11 @@
, openssl, gsettings-desktop-schemas, json-glib , openssl, gsettings-desktop-schemas, json-glib
# The themes here are soft dependencies; only icons are missing without them. # The themes here are soft dependencies; only icons are missing without them.
, hicolor-icon-theme, adwaita-icon-theme , hicolor-icon-theme, adwaita-icon-theme
, gnomeSupport ? true, libgnome-keyring
}: }:
with stdenv.lib;
let let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -34,12 +37,18 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas
glib gtk3 gettext libxkbfile libgnome-keyring libX11 glib gtk3 gettext libxkbfile libX11
freerdp libssh libgcrypt gnutls freerdp libssh libgcrypt gnutls
pcre libdbusmenu-gtk3 libappindicator-gtk3 pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core 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 = [ cmakeFlags = [
"-DWITH_VTE=OFF" "-DWITH_VTE=OFF"
@ -62,7 +71,7 @@ in stdenv.mkDerivation rec {
cp ${desktopItem}/share/applications/* $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
''; '';
meta = with stdenv.lib; { meta = {
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
homepage = https://gitlab.com/Remmina/Remmina; homepage = https://gitlab.com/Remmina/Remmina;
description = "Remote desktop client written in GTK+"; description = "Remote desktop client written in GTK+";