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 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 ]; diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index d90047e3be51..141f1bcfaa25 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -89,7 +89,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 ]}) 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 ]} ''; 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 ]} ''; 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 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 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 {