ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-18 11:08:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #196054 from wegank/remmina-libsoup-3

Browse Source
This commit is contained in:
Sandro 2022-12-04 20:21:39 +01:00 committed by GitHub
commit 8b1410f1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,8 @@
, freerdp, libssh, libgcrypt, gnutls, vte , freerdp, libssh, libgcrypt, gnutls, vte
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , pcre2, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz
# The themes here are soft dependencies; only icons are missing without them. # The themes here are soft dependencies; only icons are missing without them.
, gnome , gnome
, withLibsecret ? true , withLibsecret ? true
@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "remmina"; pname = "remmina";
version = "1.4.27"; version = "1.4.28";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "Remmina"; owner = "Remmina";
repo = "Remmina"; repo = "Remmina";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-WIppHK4ucvKqgXB8VPy9ldbw22ZuDaEn1gNaLpyb4jA="; sha256 = "sha256-w0z7teful/sdp7/f4X8eqF9Ny3bhP542V0tutQi/yXI=";
}; };
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
@ -31,11 +31,10 @@ stdenv.mkDerivation rec {
freerdp libssh libgcrypt gnutls freerdp libssh libgcrypt gnutls
pcre2 libdbusmenu-gtk3 libappindicator-gtk3 pcre2 libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon libvncserver libpthreadstubs libXdmcp libxkbcommon
libsoup spice-protocol libsoup_3 spice-protocol
# https://gitlab.com/Remmina/Remmina/-/issues/2754 spice-gtk
spice-gtk_libsoup2
libepoxy at-spi2-core libepoxy at-spi2-core
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk_4_1
harfbuzz python3 harfbuzz python3
] ++ optionals withLibsecret [ libsecret ] ] ++ optionals withLibsecret [ libsecret ]
++ optionals withVte [ vte ]; ++ optionals withVte [ vte ];