diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-14 23:55:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-14 23:55:24 +0100 |
| commit | e1ebefcef44d07c03714a2c4dd19a16be54379e0 (patch) | |
| tree | d817ea0df2ae65101303583a10df16afef0aacb5 /pkgs/applications/networking/remote | |
| parent | 3ad09d0df94da21125b7ee4a88fd7489879ac701 (diff) | |
| parent | 51e6f868385792422682131427228c74d1757760 (diff) | |
Merge pull request #204540 from SuperSandro2000/remmina-kwallet
Diffstat (limited to 'pkgs/applications/networking/remote')
| -rw-r--r-- | pkgs/applications/networking/remote/remmina/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6bf837236f44f..ce64ec0d65ef5 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -7,12 +7,11 @@ , 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 , withVte ? true }: -with lib; - stdenv.mkDerivation rec { pname = "remmina"; version = "1.4.28"; @@ -25,6 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; + buildInputs = [ gsettings-desktop-schemas glib gtk3 gettext libxkbfile libX11 @@ -36,13 +36,15 @@ stdenv.mkDerivation rec { libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk_4_1 harfbuzz python3 - ] ++ optionals withLibsecret [ libsecret ] - ++ optionals withVte [ vte ]; + ] ++ lib.optionals withLibsecret [ libsecret ] + ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] + ++ lib.optionals withVte [ vte ]; 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.so" "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" @@ -50,13 +52,15 @@ stdenv.mkDerivation rec { "-DWINPR_INCLUDE_DIR=${freerdp}/include/winpr2" ]; + dontWrapQtApps = true; + preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ) ''; - meta = { + meta = with lib; { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; |