cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #118406 from primeos/wayland-add-bin-and-dev-outputs

Browse source 
wayland: Add a "bin" and "dev" output
This commit is contained in:
Michael Weiss 2021-04-07 18:42:56 +02:00 committed by GitHub
commit c49bdf33dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/wayland/default.nix
View file

@ -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 = [

6
pkgs/development/libraries/wlroots/default.nix
View file

@ -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

1
pkgs/top-level/all-packages.nix
View file

@ -17721,6 +17721,7 @@ in
wavpack = callPackage ../development/libraries/wavpack { };
wayland = callPackage ../development/libraries/wayland { };
wayland-scanner = wayland.bin;
wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };