about summary refs log tree commit diff
path: root/pkgs/applications/networking/remote/remmina
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-10-19 19:12:36 +0000
committerJan Malakhovski <oxij@oxij.org>2018-10-19 19:12:36 +0000
commit8ec632271108a9e74c11a48da9305b7ba9711166 (patch)
tree351ca4f3ee95324d37b3fa9e493ac1e0c86ef222 /pkgs/applications/networking/remote/remmina
parent6b81005e66f1de9ccad34f2cf795fdb4f4f02942 (diff)
downloadnixlib-8ec632271108a9e74c11a48da9305b7ba9711166.tar
nixlib-8ec632271108a9e74c11a48da9305b7ba9711166.tar.gz
nixlib-8ec632271108a9e74c11a48da9305b7ba9711166.tar.bz2
nixlib-8ec632271108a9e74c11a48da9305b7ba9711166.tar.lz
nixlib-8ec632271108a9e74c11a48da9305b7ba9711166.tar.xz
nixlib-8ec632271108a9e74c11a48da9305b7ba9711166.tar.zst
nixlib-8ec632271108a9e74c11a48da9305b7ba9711166.zip
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.
Diffstat (limited to 'pkgs/applications/networking/remote/remmina')
-rw-r--r--pkgs/applications/networking/remote/remmina/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 96aa037d35bf..91c33c632b81 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchFromGitLab, cmake, pkgconfig, wrapGAppsHook
 , glib, gtk3, gettext, libxkbfile, libgnome-keyring, libX11
 , freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
-, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
+, pcre, libdbusmenu-gtk3, libappindicator-gtk3
 , 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
 # The themes here are soft dependencies; only icons are missing without them.
 , hicolor-icon-theme, adwaita-icon-theme
 }:
 
 let
-  version = "1.2.32";
 
   desktopItem = makeDesktopItem {
     name = "remmina";
@@ -22,8 +21,9 @@ let
     categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
   };
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "remmina-${version}";
+  version = "1.2.32";
 
   src = fetchFromGitLab {
     owner  = "Remmina";
@@ -36,9 +36,9 @@ in stdenv.mkDerivation {
   buildInputs = [ cmake wrapGAppsHook gsettings-desktop-schemas
                   glib gtk3 gettext libxkbfile libgnome-keyring libX11
                   freerdp libssh libgcrypt gnutls
-                  pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
+                  pcre libdbusmenu-gtk3 libappindicator-gtk3
                   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 ];
 
   cmakeFlags = [