nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42106 from ryantm/remmina

Browse Source 
remmina: 1.2.0-rcgit.24 -> 1.2.30.1
This commit is contained in:
xeji 2018-06-17 17:48:47 +02:00 committed by GitHub
commit 67a7e24b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -2458,6 +2458,11 @@
github = "meisternu";
name = "Matt Miemiec";
};
melsigl = {
email = "melanie.bianca.sigl@gmail.com";
github = "melsigl";
name = "Melanie B. Sigl";
};
metabar = {
email = "softs@metabarcoding.org";
name = "Celine Mercier";

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

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapGAppsHook
{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, spice-protocol, spice-gtk, epoxy, at-spi2-core
, openssl, gsettings-desktop-schemas
, openssl, gsettings-desktop-schemas, json-glib
# The themes here are soft dependencies; only icons are missing without them.
, hicolor-icon-theme, adwaita-icon-theme
}:
let
version = "1.2.0-rcgit.24";
version = "1.2.30.1";
desktopItem = makeDesktopItem {
name = "remmina";
@ -25,11 +25,11 @@ let
in stdenv.mkDerivation {
name = "remmina-${version}";
src = fetchFromGitHub {
owner = "FreeRDP";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
sha256 = "1x7kygl9a5nh7rf2gfrk0wwv23mbw7rrjms402l3zp1w53hrhwmg";
sha256 = "1jz20yv84a8m9gm9fsz0jii8ag90v1scmbkkx9gk38ax5il7ilvn";
};
nativeBuildInputs = [ pkgconfig ];
@ -39,7 +39,7 @@ in stdenv.mkDerivation {
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 ];
openssl hicolor-icon-theme adwaita-icon-theme json-glib ];
cmakeFlags = [
"-DWITH_VTE=OFF"
@ -64,9 +64,9 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
license = stdenv.lib.licenses.gpl2;
homepage = http://remmina.sourceforge.net/;
homepage = https://gitlab.com/Remmina/Remmina;
description = "Remote desktop client written in GTK+";
maintainers = [];
maintainers = with maintainers; [ melsigl ryantm ];
platforms = platforms.linux;
};
}