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

remmina: remove webkitgtk dependency 

It was used by "survey" module which was removed in revision
d97920eb9b32dbe17b85f8eff12928d26c19fd3d of their repository
on 2016-12-13.

Meanwhile, WebKit plugin is a separate package
https://aur.archlinux.org/packages/remmina-plugin-webkit/
not packaged in nixpkgs.
This commit is contained in:
Jan Malakhovski 2018-10-19 19:12:36 +00:00
parent 6b81005e66
commit 8ec6322711
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,15 @@
{ stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook { stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
, glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11 , glib, gtk3, gettext, libxkbfile, libgnome-keyring, 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
}: }:
let let
version = "1.2.32";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "remmina"; name = "remmina";
@ -22,8 +21,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";
@ -36,9 +36,9 @@ in stdenv.mkDerivation {
buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas
glib gtk3 gettext libxkbfile libgnome-keyring libX11 glib gtk3 gettext libxkbfile libgnome-keyring libX11
freerdp libssh libgcrypt gnutls freerdp libssh libgcrypt gnutls
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 hicolor-icon-theme adwaita-icon-theme json-glib ]; openssl hicolor-icon-theme adwaita-icon-theme json-glib ];
cmakeFlags = [ cmakeFlags = [