SDL2: use wayland-scanner from PATH
Prevents having to use buildPackages, helps overriding wayland-scanner for whoever needs it.
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user