webkitgtk: support cross compilation
which previously errored near the end of compilation with: ``` /nix/store/nnnn-wayland-aarch64-unknown-linux-gnu-1.22.0-bin/bin/wayland-scanner: line 0: syntax error: unexpected word (expecting ")") ``` that is, the build was trying to invoke the host `wayland-scanner`: both host and build wayland-scanner are made available to the build environment and the build script isn't smart enough to choose the right one. fix by explicitly instructing which `wayland-scanner` to use.
This commit is contained in:
parent
0d930cd6bb
commit
72b3e9b5a0
|
@ -1,5 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
|
, buildPackages
|
||||||
, runCommand
|
, runCommand
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, perl
|
, perl
|
||||||
|
@ -122,8 +123,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
gi-docgen
|
gi-docgen
|
||||||
glib # for gdbus-codegen
|
glib # for gdbus-codegen
|
||||||
unifdef
|
unifdef
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
|
||||||
wayland # for wayland-scanner
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -206,6 +205,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
# https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353
|
# https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353
|
||||||
"-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"
|
"-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"
|
||||||
"-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"
|
"-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"
|
||||||
|
"-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
"-DENABLE_GAMEPAD=OFF"
|
"-DENABLE_GAMEPAD=OFF"
|
||||||
"-DENABLE_GTKDOC=OFF"
|
"-DENABLE_GTKDOC=OFF"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user