Remove obsolete libXrandr inputs from programs using winit (#354847)

This commit is contained in:
Franz Pletz 2024-11-11 11:11:37 +01:00 committed by GitHub
commit dc460ec76c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 3 additions and 8 deletions

View File

@ -33,7 +33,6 @@ let
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libXxf86vm
xorg.libxcb
libxkbcommon

View File

@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
libGL
xorg.libXcursor
xorg.libXi
xorg.libXrandr
xorg.libX11
];

View File

@ -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 ]})

View File

@ -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
]}
'';

View File

@ -104,7 +104,6 @@ rustPlatform.buildRustPackage rec {
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libXrandr
]}
'';

View File

@ -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

View File

@ -57,7 +57,6 @@ rustPlatform.buildRustPackage {
wayland
xorg.libX11
xorg.libXcursor
xorg.libXrandr
xorg.libXi
xorg.libxcb
xorg.libXrender

View File

@ -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 {