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

remmina: clean up

Browse Source 
Desktop file is included now, so no need to create it manually.
libgnome-keyring is not used anymore, libsecret replaced it.
This commit is contained in:
Jan Tojnar 2018-10-27 14:42:03 +02:00
parent 6b3bff4378
commit b4c54485bf
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook { stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, 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
@ -7,24 +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; with stdenv.lib;
let stdenv.mkDerivation {
desktopItem = makeDesktopItem {
name = "remmina";
desktopName = "Remmina";
genericName = "Remmina Remote Desktop Client";
exec = "remmina";
icon = "remmina";
comment = "Connect to remote desktops";
categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
};
in stdenv.mkDerivation rec {
name = "remmina-${version}"; name = "remmina-${version}";
version = "1.2.32"; version = "1.2.32";
@ -35,22 +22,16 @@ in stdenv.mkDerivation rec {
sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw"; sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
buildInputs = [ buildInputs = [
cmake wrapGAppsHook gsettings-desktop-schemas gsettings-desktop-schemas
glib gtk3 gettext libxkbfile 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"
@ -68,13 +49,8 @@ in stdenv.mkDerivation rec {
) )
''; '';
postInstall = ''
mkdir -pv $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
meta = { meta = {
license = stdenv.lib.licenses.gpl2; license = 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+";
maintainers = with maintainers; [ melsigl ryantm ]; maintainers = with maintainers; [ melsigl ryantm ];