From a0bc021caebf27a52915acf24aed610ecaa1c53d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 21:39:34 +0100 Subject: [PATCH 1/8] coppwr: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (coppwr 1.6.1). Tested that it still starts on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/co/coppwr/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 47e99a96f202..55d340563cfa 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec { libGL xorg.libXcursor xorg.libXi - xorg.libXrandr xorg.libX11 ]; From d91e9dd0faa5b7a43f4f00558426cf42d8b0742e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 21:42:22 +0100 Subject: [PATCH 2/8] cosmic-comp: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (cosmic-comp 1.0.0-alpha.1). Tested that it still starts on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/co/cosmic-comp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 09e457dc8557..34870270672a 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -90,7 +90,7 @@ rustPlatform.buildRustPackage rec { # be the common case, so just make them available, don't link them. postInstall = '' wrapProgramArgs=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr + xorg.libX11 xorg.libXcursor xorg.libXi ]}) '' + lib.optionalString useXWayland '' wrapProgramArgs+=(--prefix PATH : ${lib.makeBinPath [ xwayland ]}) From 86d824132693b6d3b76e684dc74897bd60cc8e7e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 21:43:49 +0100 Subject: [PATCH 3/8] cosmic-edit: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (cosmic-edit 1.0.0-alpha.3). Tested that it still starts on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/co/cosmic-edit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 54f87b464600..a644a3212f59 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/cosmic-edit" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland + xorg.libX11 xorg.libXcursor xorg.libXi vulkan-loader libxkbcommon wayland ]} ''; From 68d10c6cc3bb2ec7a58f7d10c51059c42dbf7db0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 21:44:44 +0100 Subject: [PATCH 4/8] cosmic-term: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (cosmic-term 1.0.0-alpha.3). Tested that it still starts on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/co/cosmic-term/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index cfe98f4288fd..396dff2a7460 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -104,7 +104,6 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXcursor xorg.libXi - xorg.libXrandr ]} ''; From 77c0b0b54457b544097e2eb97048bdce7cf2c201 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 21:45:13 +0100 Subject: [PATCH 5/8] halloy: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (halloy 2024.8). Tested that it still starts on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/ha/halloy/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 2fc97ae6ad9d..678525c614dd 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -51,7 +51,6 @@ rustPlatform.buildRustPackage rec { xorg.libX11 xorg.libXcursor xorg.libXi - xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit From 0120ed5ea9f11c63bb606b2b2b2286b50c7b5d24 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 21:46:39 +0100 Subject: [PATCH 6/8] ruffle: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (ruffle nightly-2024-09-12). Tested that it still starts on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/ru/ruffle/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 55b2ce67fc9b..86586f05e590 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -57,7 +57,6 @@ rustPlatform.buildRustPackage { wayland xorg.libX11 xorg.libXcursor - xorg.libXrandr xorg.libXi xorg.libxcb xorg.libXrender From e70954dca60d3f3905ec54fe0536a7bb35f1cd66 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 22:23:19 +0100 Subject: [PATCH 7/8] alacritty: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (alacritty 0.14.0). Tested that it still starts on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/al/alacritty/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index c511619c276c..ff9e28c27b7b 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -33,7 +33,6 @@ let xorg.libX11 xorg.libXcursor xorg.libXi - xorg.libXrandr xorg.libXxf86vm xorg.libxcb libxkbcommon From 031786067beaa2f54a5cd65377c302684de4b1ba Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Nov 2024 22:23:51 +0100 Subject: [PATCH 8/8] slint-lsp: remove obsolete libXrandr input libXrandr has not been required since winit 0.30.0[1] (slint-lsp 1.7.0). Tested that previews still work on X11. [1]: https://github.com/rust-windowing/winit/commit/bb9b629bc34c6db8fa1ebda24a03ce0ddbc1d51e --- pkgs/by-name/sl/slint-lsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 969457481da7..a65350cac598 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -20,7 +20,7 @@ }: let - rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ] + rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; in rustPlatform.buildRustPackage rec {