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

Merge pull request #48722 from oxij/pkgs/remmina-no-webkit-no-gnome

Browse Source 
remmina: no webkit, optional gnome
This commit is contained in:
Jörg Thalheim 2018-10-19 22:59:28 +01:00 committed by GitHub
commit 7f4608f047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,18 @@
{ 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, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , pcre, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , 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 , 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
version = "1.2.32";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "remmina"; name = "remmina";
@ -22,8 +24,9 @@ let
categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation rec {
name = "remmina-${version}"; name = "remmina-${version}";
version = "1.2.32";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "Remmina"; owner = "Remmina";
@ -33,13 +36,21 @@ in stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas buildInputs = [
glib gtk3 gettext libxkbfile libgnome-keyring libX11 cmake wrapGAppsHook gsettings-desktop-schemas
freerdp libssh libgcrypt gnutls glib gtk3 gettext libxkbfile libX11
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 freerdp libssh libgcrypt gnutls
libvncserver libpthreadstubs libXdmcp libxkbcommon pcre libdbusmenu-gtk3 libappindicator-gtk3
libsecret spice-protocol spice-gtk epoxy at-spi2-core libvncserver libpthreadstubs libXdmcp libxkbcommon
openssl hicolor-icon-theme adwaita-icon-theme json-glib ]; 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 = [ cmakeFlags = [
"-DWITH_VTE=OFF" "-DWITH_VTE=OFF"
@ -62,7 +73,7 @@ in stdenv.mkDerivation {
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+";