From 1c561baac632b589a07ad2119aeb5acde4490e24 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 5 Feb 2023 22:17:47 +0000
Subject: [PATCH] Revert "wayland: mark as broken on darwin"

This reverts commit d9986a53eefc890b55fd01eb88b990c0bcd7471d.

That commit turned a package that built for macOS into a package that
was marked broken for both (also breaking the wayland-scanner
attribute, which is important for cross-compiling to Linux), and
complicated the mesa-demos expression, with no explanation given and
only four hours of opportunity for review.
---
 pkgs/development/libraries/wayland/default.nix |  2 +-
 pkgs/top-level/all-packages.nix                | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 8d229678a3c8..bb764d641436 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,7 +8,7 @@
 , wayland-scanner
 , expat
 , libxml2
-, withLibraries ? true
+, withLibraries ? stdenv.isLinux
 , libffi
 , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform
 , graphviz-nox
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ad4750ce399..2a439e6805f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9084,17 +9084,7 @@ with pkgs;
 
   memtester = callPackage ../tools/system/memtester { };
 
-  mesa-demos =
-    let
-      wayland' = wayland.override { withLibraries = stdenv.isLinux; };
-    in
-    callPackage ../tools/graphics/mesa-demos {
-      wayland = wayland';
-      wayland-protocols = wayland-protocols.override {
-        wayland = wayland';
-        wayland-scanner = wayland'.bin;
-      };
-    };
+  mesa-demos = callPackage ../tools/graphics/mesa-demos { };
 
   mhonarc = perlPackages.MHonArc;