Commit b46f93f0 authored by Alyssa Ross's avatar Alyssa Ross Committed by Florian Klink
Browse files

webkitgtk: depend on wayland-scanner 

Currently wayland-scanner is defined to be wayland.bin, but we want to
split wayland-scanner into a separate package.

The previous explicit -DWAYLAND_SCANNER= is removed - the binary is in
a separate bin output and it works out of the box just with
wayland-scanner in nativeBuildInputs.
parent e2292818

pkgs/development/libraries/webkitgtk/default.nix

+32 −28
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
, gtk3

, wayland

, wayland-protocols

, wayland-scanner

, libwebp

, enchant2

, xorg
@@ -117,6 +118,8 @@ stdenv.mkDerivation (finalAttrs: { 
    gi-docgen

    glib # for gdbus-codegen

    unifdef

  ] ++ lib.optionals stdenv.isLinux [

    wayland-scanner

  ];



  buildInputs = [
@@ -186,9 +189,11 @@ stdenv.mkDerivation (finalAttrs: { 
    libsoup

  ];



  cmakeFlags = let

  cmakeFlags =

    let

      cmakeBool = x: if x then "ON" else "OFF";

  in [

    in

    [

      "-DENABLE_INTROSPECTION=ON"

      "-DPORT=GTK"

      "-DUSE_LIBHYPHEN=OFF"
@@ -200,7 +205,6 @@ 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"