From 9d581efa3f74104531d29b7839b0dcb7fe4d6a0a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 16 May 2025 22:53:37 +0200
Subject: [PATCH 1/2] guacamole-server: 1.5.5 -> 1.5.5-unstable-2025-05-16

Fix RDP support
Fix #395919
---
 pkgs/by-name/gu/guacamole-server/package.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix
index a146225be312..9b4411f084e6 100644
--- a/pkgs/by-name/gu/guacamole-server/package.nix
+++ b/pkgs/by-name/gu/guacamole-server/package.nix
@@ -28,23 +28,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "guacamole-server";
-  version = "1.5.5";
+  version = "1.6.0-unstable-2025-05-16";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "guacamole-server";
-    rev = finalAttrs.version;
-    hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY=";
+    rev = "acb69735359d4d4a08f65d6eb0bde2a0da08f751";
+    hash = "sha256-rqGSQD9EYlK1E6y/3EzynRmBWJOZBrC324zVvt7c2vM=";
   };
 
-  patches = [
-    # GUACAMOLE-1952: Add compatibility with FFMPEG 7.0
-    (fetchpatch2 {
-      url = "https://github.com/apache/guacamole-server/commit/cc8addf9beb90305037a32f9f861a893be4cae08.patch?full_index=1";
-      hash = "sha256-VCr2/8lQHKVdsdah9gvak4MjFHO+X4ixE5+zsvwIY1I=";
-    })
-  ];
-
   NIX_CFLAGS_COMPILE = [
     "-Wno-error=format-truncation"
     "-Wno-error=format-overflow"

From 9182bf4d85266cdf5476b81b57ab080fbab0369f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 16 May 2025 23:05:18 +0200
Subject: [PATCH 2/2] freerdp: 3.15.0 -> 3.15.0-unstable-2025-05-16

Includes a patch from https://github.com/FreeRDP/FreeRDP/pull/11439
Fixing the GCC warnings and make guacamole-server compiling
successfully.
---
 pkgs/by-name/fr/freerdp/package.nix | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index e6bbb2fed073..340e0e1704eb 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -2,7 +2,9 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
+  writableTmpDirAsHomeHook,
   docbook-xsl-nons,
   libxslt,
   pkg-config,
@@ -62,7 +64,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.15.0";
+  version = "3.15.0-unstable-2025-05-16";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
@@ -71,10 +73,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xz1vP58hElXe/jLVrJOSpXcbqShBV7LHRpzqPLa2fDU=";
   };
 
+  patches = [
+    # Patch from https://github.com/FreeRDP/FreeRDP/pull/11439
+    # To be removed at the next release
+    (fetchpatch2 {
+      url = "https://github.com/FreeRDP/FreeRDP/commit/67fabc34dce7aa3543e152f78cb4ea88ac9d1244.patch";
+      hash = "sha256-kYCEjH1kXZJbg2sN6YNhh+y19HTTCaC7neof8DTKZ/8=";
+    })
+  ];
+
   postPatch =
     ''
-      export HOME=$TMP
-
       # skip NIB file generation on darwin
       substituteInPlace "client/Mac/CMakeLists.txt" "client/Mac/cli/CMakeLists.txt" \
         --replace-fail "if(NOT IS_XCODE)" "if(FALSE)"
@@ -100,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     docbook-xsl-nons
     pkg-config
     wayland-scanner
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs =
@@ -198,15 +208,15 @@ stdenv.mkDerivation (finalAttrs: {
     inherit gnome-remote-desktop;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Remote Desktop Protocol Client";
     longDescription = ''
       FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
       following the Microsoft Open Specifications.
     '';
     homepage = "https://www.freerdp.com/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.unix;
   };
 })