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

Merge pull request #311883 from gador/remmina-fix-darwin

Browse Source 
remmina: only use fuse on linux systems
This commit is contained in:
Sandro 2024-05-15 23:09:43 +02:00 committed by GitHub
commit da2910473e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3 { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook3
, curl, fuse3 , curl, fuse3, fetchpatch2
, desktopToDarwinBundle , desktopToDarwinBundle
, glib, gtk3, gettext, libxkbfile, libX11, python3 , glib, gtk3, gettext, libxkbfile, libX11, python3
, freerdp3, libssh, libgcrypt, gnutls, vte , freerdp3, libssh, libgcrypt, gnutls, vte
@ -26,11 +26,19 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM="; hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM=";
}; };
patches = [
(fetchpatch2 {
name = "add-a-conditional-check-for-darwin-and-NetBSD.patch";
url = "https://gitlab.com/Remmina/Remmina/-/commit/3b681398c823e070c7f780166b9d9fc2158e66c1.diff";
hash = "sha256-Ovdrsl9bftXiuXV+sqvDP9VGuXQZzC5VKOmkYmBXhNA=";
})
];
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ]
++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
buildInputs = [ buildInputs = [
curl fuse3 curl
gsettings-desktop-schemas gsettings-desktop-schemas
glib gtk3 gettext libxkbfile libX11 glib gtk3 gettext libxkbfile libX11
freerdp3 libssh libgcrypt gnutls freerdp3 libssh libgcrypt gnutls
@ -42,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
openssl gnome.adwaita-icon-theme json-glib libsodium openssl gnome.adwaita-icon-theme json-glib libsodium
harfbuzz python3 harfbuzz python3
wayland wayland
] ++ lib.optionals stdenv.isLinux [ libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ]
++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals withLibsecret [ libsecret ]
++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ]
++ lib.optionals withVte [ vte ]; ++ lib.optionals withVte [ vte ];