diff options
| author | Rick van Schijndel <rol3517@gmail.com> | 2022-05-09 20:13:14 +0200 |
|---|---|---|
| committer | Rick van Schijndel <rol3517@gmail.com> | 2022-05-09 20:57:31 +0200 |
| commit | 7d5b75b12ab622480ce32ae2e0801edcf23a66d3 (patch) | |
| tree | 0a38e4f8d4e890b0443db79384f5762130528af7 /pkgs/development/libraries/SDL2 | |
| parent | 4729cb69e35e67bcc0221da00953524d62402a89 (diff) | |
| download | nixpkgs-7d5b75b12ab622480ce32ae2e0801edcf23a66d3.tar nixpkgs-7d5b75b12ab622480ce32ae2e0801edcf23a66d3.tar.gz nixpkgs-7d5b75b12ab622480ce32ae2e0801edcf23a66d3.tar.bz2 nixpkgs-7d5b75b12ab622480ce32ae2e0801edcf23a66d3.tar.lz nixpkgs-7d5b75b12ab622480ce32ae2e0801edcf23a66d3.tar.xz nixpkgs-7d5b75b12ab622480ce32ae2e0801edcf23a66d3.tar.zst nixpkgs-7d5b75b12ab622480ce32ae2e0801edcf23a66d3.zip | |
SDL2: use wayland-scanner from PATH
Prevents having to use buildPackages, helps overriding wayland-scanner for whoever needs it.
Diffstat (limited to 'pkgs/development/libraries/SDL2')
| -rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 6 |
1 files 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; |