glfw: remove merged X11 patch

2 years ago · 271564ed3c
parent 3eb6b5fc73
commit 271564ed3c
1 changed files with 2 additions and 3 deletions
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@ -16,9 +16,8 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-aWwt6FRq/ofQmZAeavDa8inrJfrPxb8iyo1XYdQsrKc=";
  };

-  # Fix freezing on Wayland (https://github.com/glfw/glfw/pull/1711)
-  # and linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
-  patches = if waylandSupport then ./wayland.patch else ./x11.patch;
+  # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
+  patches = lib.optional (!waylandSupport) ./x11.patch;

  propagatedBuildInputs = [ libGL ];