diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-04-03 15:29:55 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-04-03 15:31:27 +0200 |
| commit | 6a30a601c7dfed9d2c763b21c3b05ae6fced8a06 (patch) | |
| tree | d8773cb8fc078d8da7b9eb7877e1952e90c064d9 /pkgs/development/libraries | |
| parent | 827f7a3e43f80b2d0886cadbd3eb4d1bc154568f (diff) | |
wayland: Add a "bin" and "dev" output
Another advantage is that we can now use the wayland-scanner alias for nativeBuildInputs (which is less confusing than adding "wayland" to both nativeBuildInputs and buildInputs).
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 6 |
2 files changed, 4 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 |