From c892f85e78098d835a52bb219bd22993241bc503 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 25 Mar 2025 12:48:55 +0100 Subject: [PATCH] treewide: switch to unpinned freerdp --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- pkgs/by-name/gn/gnome-remote-desktop/package.nix | 6 +++--- pkgs/by-name/gt/gtk-frdp/package.nix | 4 ++-- pkgs/by-name/we/weston/package.nix | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 42f36c1f7257..9020ea614166 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -15,7 +15,7 @@ libxkbfile, libX11, python3, - freerdp3, + freerdp, libssh, libgcrypt, gnutls, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { gettext libxkbfile libX11 - freerdp3 + freerdp libssh libgcrypt gnutls diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix index bcf3d0929c2e..f4f8091d28e5 100644 --- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -21,7 +21,7 @@ libopus, libxkbcommon, gdk-pixbuf, - freerdp3, + freerdp, fdk_aac, tpm2-tss, fuse3, @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo - freerdp3 + freerdp fdk_aac tpm2-tss fuse3 @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "-Dsystemd_tmpfiles_dir=${placeholder "out"}/lib/tmpfiles.d" "-Dtests=false" # Too deep of a rabbit hole. # TODO: investigate who should be fixed here. - "-Dc_args=-I${freerdp3}/include/winpr3" + "-Dc_args=-I${freerdp}/include/winpr3" ]; passthru = { diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix index fdd63978bf43..d45904eb477d 100644 --- a/pkgs/by-name/gt/gtk-frdp/package.nix +++ b/pkgs/by-name/gt/gtk-frdp/package.nix @@ -9,7 +9,7 @@ gobject-introspection, glib, gtk3, - freerdp3, + freerdp, fuse3, unstableGitUpdater, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation { buildInputs = [ glib gtk3 - freerdp3 + freerdp fuse3 ]; diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 16fe178ac36f..8c31cb0b22a0 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -31,7 +31,7 @@ pipewireSupport ? true, pipewire, rdpSupport ? true, - freerdp3, + freerdp, remotingSupport ? true, gst_all_1, vaapiSupport ? true, @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ++ lib.optional lcmsSupport lcms2 ++ lib.optional pangoSupport pango ++ lib.optional pipewireSupport pipewire - ++ lib.optional rdpSupport freerdp3 + ++ lib.optional rdpSupport freerdp ++ lib.optionals remotingSupport [ gst_all_1.gstreamer gst_all_1.gst-plugins-base