diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2023-12-01 18:22:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 18:22:36 +0100 |
| commit | 2344fe1da14cb08b0c18743b207995f9b8597915 (patch) | |
| tree | 09e15a1847b1c182b3382f02c42c231ecda76150 | |
| parent | 49a204d40e716c4dfff411613dad75ebf205b111 (diff) | |
| parent | 05a8640892d82265583c71123dfd6bf3a81d95ae (diff) | |
| download | nixlib-2344fe1da14cb08b0c18743b207995f9b8597915.tar nixlib-2344fe1da14cb08b0c18743b207995f9b8597915.tar.gz nixlib-2344fe1da14cb08b0c18743b207995f9b8597915.tar.bz2 nixlib-2344fe1da14cb08b0c18743b207995f9b8597915.tar.lz nixlib-2344fe1da14cb08b0c18743b207995f9b8597915.tar.xz nixlib-2344fe1da14cb08b0c18743b207995f9b8597915.tar.zst nixlib-2344fe1da14cb08b0c18743b207995f9b8597915.zip | |
Merge pull request #266368 from bbigras/remmina
| -rw-r--r-- | pkgs/applications/networking/remote/remmina/default.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 9e3eeb711cb4..6d3d6610cf91 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, cmake, ninja, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 , freerdp, libssh, libgcrypt, gnutls, vte @@ -15,23 +15,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.31"; + version = "1.4.33"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-oEgpav4oQ9Sld9PY4TsutS5xEnhQgOHnpQhDesRFTeQ="; + rev = "v.${finalAttrs.version}"; + sha256 = "sha256-3HyG2PBnTq/fVsvWA81fQ2gCOoAxINWeUDwzKcOuECk="; }; - patches = [ - # https://gitlab.com/Remmina/Remmina/-/merge_requests/2525 - (fetchpatch { - url = "https://gitlab.com/Remmina/Remmina/-/commit/2ce153411597035d0f3db5177d703541e09eaa06.patch"; - hash = "sha256-RV/8Ze9aN4dW49Z+y3z0jFs4dyEWu7DK2FABtmse9Hc="; - }) - ]; - nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; @@ -89,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; - maintainers = with maintainers; [ melsigl ryantm ]; + maintainers = with maintainers; [ bbigras melsigl ryantm ]; platforms = platforms.linux ++ platforms.darwin; }; }) |