diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 875b6508d6f0c..07671ddebddcc 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patchShebangs doc/doxygen/gen-doxygen.py ''; - outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; + outputs = [ "out" "bin" "dev" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; separateDebugInfo = true; mesonFlags = [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a21179e20259b..50ccd3608d8c3 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland -, libGL, wayland-protocols, libinput, libxkbcommon, pixman +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner +, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88965c6c3358c..159fef5a6cf35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17687,6 +17687,7 @@ in wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { }; + wayland-scanner = wayland.bin; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; |