From 271564ed3c57e8e0fb7ae513ac0a63c35dbd55ea Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 11 Apr 2022 23:58:59 +0100 Subject: [PATCH] glfw: remove merged X11 patch --- pkgs/development/libraries/glfw/3.x.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 660ad1ba607..3aedaab5658 100644 --- 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 ];