Unverified Commit dc460ec7 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

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

parents f1b26f50 03178606
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ let
    xorg.libX11
    xorg.libXcursor
    xorg.libXi
    xorg.libXrandr
    xorg.libXxf86vm
    xorg.libxcb
    libxkbcommon
+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
    libGL
    xorg.libXcursor
    xorg.libXi
    xorg.libXrandr
    xorg.libX11
  ];

+1 −1
Original line number Diff line number Diff line
@@ -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 ]})
+1 −1
Original line number Diff line number Diff line
@@ -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
      ]}
  '';

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ rustPlatform.buildRustPackage rec {
        xorg.libX11
        xorg.libXcursor
        xorg.libXi
        xorg.libXrandr
      ]}
  '';

Loading