diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2024-04-12 00:26:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 00:26:02 +0200 |
| commit | a64fa316aa181ec9abd330bd4ce2b9aeb4ed3dfa (patch) | |
| tree | c5cee8dadea3783dbbb8be0b791d74cd5f558f26 | |
| parent | 4a0fd38b81ff06bbe6cb4370702313332416ea08 (diff) | |
| parent | 72b3e9b5a0d838ff3a374f9e35e9da0880c01b85 (diff) | |
Merge pull request #265968 from uninsane/pr-webkitgtk-cross
webkitgtk: support cross compilation
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 07fc616efacc7..ca368076d7716 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPackages , runCommand , fetchurl , perl @@ -113,8 +114,6 @@ stdenv.mkDerivation (finalAttrs: { gi-docgen glib # for gdbus-codegen unifdef - ] ++ lib.optionals stdenv.isLinux [ - wayland # for wayland-scanner ]; buildInputs = [ @@ -190,6 +189,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" |