From 95cde9d5d63f81bce59ae2c98b20f15a6788f303 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 19 Jul 2023 10:44:16 +1000 Subject: [PATCH 1/2] remmina: support building on macOS --- .../networking/remote/remmina/default.nix | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 345e838c8cd6..04bbc2d9c4fe 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -7,19 +7,19 @@ , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome -, withKf5Wallet ? true, libsForQt5 -, withLibsecret ? true +, withKf5Wallet ? stdenv.isLinux, libsForQt5 +, withLibsecret ? stdenv.isLinux , withVte ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "remmina"; version = "1.4.31"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-oEgpav4oQ9Sld9PY4TsutS5xEnhQgOHnpQhDesRFTeQ="; }; @@ -29,34 +29,50 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 freerdp libssh libgcrypt gnutls - pcre2 libdbusmenu-gtk3 libappindicator-gtk3 + pcre2 libvncserver libpthreadstubs libXdmcp libxkbcommon libsoup_3 spice-protocol spice-gtk 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 - ] ++ 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 withVte [ vte ]; - cmakeFlags = [ + cmakeFlags = let + sharedLibraryExt = if stdenv.isDarwin then "dylib" else "so"; + in [ "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" - "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" - "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so" + "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.${sharedLibraryExt}" + "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.${sharedLibraryExt}" + "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.${sharedLibraryExt}" "-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; preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" + ${lib.optionalString stdenv.isDarwin '' + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + ''} ) ''; @@ -65,6 +81,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; maintainers = with maintainers; [ melsigl ryantm ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; -} +}) From 6137ab75328a8e177bc21ff24f649de37733107a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 00:15:48 +0200 Subject: [PATCH 2/2] remmina: minor cleanup --- .../applications/networking/remote/remmina/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 04bbc2d9c4fe..2972b21d5aa3 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -41,17 +41,15 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] ++ lib.optionals withVte [ vte ]; - cmakeFlags = let - sharedLibraryExt = if stdenv.isDarwin then "dylib" else "so"; - in [ + cmakeFlags = [ "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.${sharedLibraryExt}" - "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.${sharedLibraryExt}" - "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.${sharedLibraryExt}" + "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2${stdenv.hostPlatform.extensions.sharedLibrary}" "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" ] ++ lib.optionals stdenv.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 944187a0dd1f..ec69b33926cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12367,7 +12367,7 @@ with pkgs; 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 { };