BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #244258 from Enzime/remmina-macos

Browse source 
remmina: support building on macOS
This commit is contained in:
Weijia Wang 2023-08-06 00:48:18 +02:00 committed by GitHub
commit a62f04fdd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/applications/networking/remote/remmina/default.nix
View file

@ -7,19 +7,19 @@
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, 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
, withKf5Wallet ? true, libsForQt5 , withKf5Wallet ? stdenv.isLinux, libsForQt5
, withLibsecret ? true , withLibsecret ? stdenv.isLinux
, withVte ? true , withVte ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "remmina"; pname = "remmina";
version = "1.4.31"; version = "1.4.31";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "Remmina"; owner = "Remmina";
repo = "Remmina"; repo = "Remmina";
rev = "v${version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-oEgpav4oQ9Sld9PY4TsutS5xEnhQgOHnpQhDesRFTeQ="; sha256 = "sha256-oEgpav4oQ9Sld9PY4TsutS5xEnhQgOHnpQhDesRFTeQ=";
}; };
@ -29,14 +29,15 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas gsettings-desktop-schemas
glib gtk3 gettext libxkbfile libX11 glib gtk3 gettext libxkbfile libX11
freerdp libssh libgcrypt gnutls freerdp libssh libgcrypt gnutls
pcre2 libdbusmenu-gtk3 libappindicator-gtk3 pcre2
libvncserver libpthreadstubs libXdmcp libxkbcommon libvncserver libpthreadstubs libXdmcp libxkbcommon
libsoup_3 spice-protocol libsoup_3 spice-protocol
spice-gtk spice-gtk
libepoxy at-spi2-core libepoxy at-spi2-core
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk_4_1 openssl gnome.adwaita-icon-theme json-glib libsodium
harfbuzz python3 harfbuzz python3
] ++ lib.optionals withLibsecret [ libsecret ] ] ++ lib.optionals stdenv.isLinux [ libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ]
++ lib.optionals withLibsecret [ libsecret ]
++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ]
++ lib.optionals withVte [ vte ]; ++ lib.optionals withVte [ vte ];
@ -46,17 +47,30 @@ stdenv.mkDerivation rec {
"-DWITH_AVAHI=OFF" "-DWITH_AVAHI=OFF"
"-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}"
"-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}"
"-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so" "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2"
] ++ lib.optionals stdenv.isDarwin [
"-DHAVE_LIBAPPINDICATOR=OFF"
"-DWITH_CUPS=OFF"
"-DWITH_ICON_CACHE=OFF"
"-DWITH_WEBKIT2GTK=OFF"
]; ];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [
"-DTARGET_OS_IPHONE=0"
"-DTARGET_OS_WATCH=0"
]);
dontWrapQtApps = true; dontWrapQtApps = true;
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${libX11.out}/lib" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
${lib.optionalString stdenv.isDarwin ''
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
''}
) )
''; '';
@ -65,6 +79,6 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.com/Remmina/Remmina"; homepage = "https://gitlab.com/Remmina/Remmina";
description = "Remote desktop client written in GTK"; description = "Remote desktop client written in GTK";
maintainers = with maintainers; [ melsigl ryantm ]; maintainers = with maintainers; [ melsigl ryantm ];
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} })

2
pkgs/top-level/all-packages.nix
View file

@ -12400,7 +12400,7 @@ with pkgs;
remind = callPackage ../tools/misc/remind { }; remind = callPackage ../tools/misc/remind { };
remmina = callPackage ../applications/networking/remote/remmina { }; remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { };
rename = callPackage ../tools/misc/rename { }; rename = callPackage ../tools/misc/rename { };