From 7d5b75b12ab622480ce32ae2e0801edcf23a66d3 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Mon, 9 May 2022 20:13:14 +0200
Subject: [PATCH] SDL2: use wayland-scanner from PATH

Prevents having to use buildPackages, helps overriding wayland-scanner for whoever needs it.
---
 pkgs/development/libraries/SDL2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 75e0cd1c02a..0112748695e 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -22,6 +22,7 @@
 , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
 , wayland
 , wayland-protocols
+, wayland-scanner
 , drmSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
 , libdrm
 , mesa
@@ -49,7 +50,6 @@
 , audiofile
 , libiconv
 , withStatic ? false
-, buildPackages
 }:
 
 # NOTE: When editing this expression see if the same change applies to
@@ -81,14 +81,14 @@ stdenv.mkDerivation rec {
     # Fix running wayland-scanner for the build platform when cross-compiling.
     # See comment here: https://github.com/libsdl-org/SDL/issues/4860#issuecomment-1119003545
     substituteInPlace configure \
-      --replace '$(WAYLAND_SCANNER)' "${buildPackages.wayland-scanner}/bin/wayland-scanner"
+      --replace '$(WAYLAND_SCANNER)' 'wayland-scanner'
   '';
 
   strictDeps = true;
 
   depsBuildBuild = [ pkg-config ];
 
-  nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ];
+  nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ];
 
   propagatedBuildInputs = dlopenPropagatedBuildInputs;