Commit 72b3e9b5 authored by Colin's avatar Colin
Browse files

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.
parent 0d930cd6

pkgs/development/libraries/webkitgtk/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, stdenv

, buildPackages

, runCommand

, fetchurl

, perl
@@ -122,8 +123,6 @@ stdenv.mkDerivation (finalAttrs: { 
    gi-docgen

    glib # for gdbus-codegen

    unifdef

  ] ++ lib.optionals stdenv.isLinux [

    wayland # for wayland-scanner

  ];



  buildInputs = [
@@ -206,6 +205,7 @@ stdenv.mkDerivation (finalAttrs: { 
    # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353

    "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"

    "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"

    "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner"

  ] ++ lib.optionals stdenv.isDarwin [

    "-DENABLE_GAMEPAD=OFF"

    "-DENABLE_GTKDOC=OFF"