From e718af88d93b8c31c80a8e8c85b7d0e109c4cdbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Mar 2025 05:52:03 +0000 Subject: [PATCH 1/3] freerdp3: 3.12.0 -> 3.14.0 --- pkgs/applications/networking/remote/freerdp/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index a986c7b38e48..beaa5b5d2149 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -67,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.12.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-Bbpwfnz8xPyNLZ+UtcYw4arpzGEh3znqncExl4DlByA="; + hash = "sha256-Dd7J0QpKNY0cbTldtKkXjBoAJUSCyDf9Pzoah+Ak9Vw="; }; postPatch = From e250ce83095392ad398387e6fd05bd56e2e5c61b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 23 Mar 2025 23:11:43 +0100 Subject: [PATCH 2/3] freerdp3: fix passthru tests --- pkgs/applications/networking/remote/freerdp/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index beaa5b5d2149..9072f8549721 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -61,7 +61,7 @@ # tries to compile and run generate_argument_docbook.c withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, - gnome, + gnome-remote-desktop, remmina, }: @@ -213,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit remmina; - inherit (gnome) gnome-remote-desktop; + inherit gnome-remote-desktop; }; meta = with lib; { From b9c50ea3cd5269e43f608db388025e6a3fb372ec Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 23 Mar 2025 23:15:25 +0100 Subject: [PATCH 3/3] freerdp3: use new apple sdk pattern --- .../networking/remote/freerdp/3.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index 9072f8549721..5c8de9b45f1c 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -51,11 +51,6 @@ libopus, buildServer ? true, nocaps ? false, - AudioToolbox, - AVFoundation, - Carbon, - Cocoa, - CoreMedia, withUnfree ? false, # tries to compile and run generate_argument_docbook.c @@ -154,13 +149,6 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-scanner ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AVFoundation - Carbon - Cocoa - CoreMedia - ] ++ lib.optionals withUnfree [ faac ]; @@ -205,12 +193,6 @@ stdenv.mkDerivation (finalAttrs: { ] ); - env.NIX_LDFLAGS = toString ( - lib.optionals stdenv.hostPlatform.isDarwin [ - "-framework AudioToolbox" - ] - ); - passthru.tests = { inherit remmina; inherit gnome-remote-desktop; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83b12ea5784e..cc26ed0420c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13394,10 +13394,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; }; - freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; - }; + freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix {}; }) freerdp freerdp3