BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #72420 from minijackson/waylandpp-0.2.7

Browse source 
waylandpp: 0.2.5 -> 0.2.7, make it split-output package
This commit is contained in:
Domen Kožar 2020-04-22 13:12:06 +02:00 committed by GitHub
commit ace7b93131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/kodi/default.nix
View file

@ -183,7 +183,7 @@ in stdenv.mkDerivation {
++ lib.optional usbSupport libusb
++ lib.optional vdpauSupport libvdpau
++ lib.optionals useWayland [
wayland waylandpp
wayland waylandpp.dev
# Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
libxkbcommon.dev
]
@ -200,7 +200,7 @@ in stdenv.mkDerivation {
which
pkgconfig gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
] ++ lib.optionals useWayland [ wayland-protocols ];
] ++ lib.optionals useWayland [ wayland-protocols waylandpp.bin ];
cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}"

16
pkgs/development/libraries/waylandpp/default.nix
View file

@ -1,19 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL
, docSupport ? true, doxygen ? null }:
assert docSupport -> doxygen != null;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "waylandpp";
version = "0.2.5";
version = "0.2.7";
src = fetchFromGitHub {
owner = "NilsBrause";
repo = pname;
rev = version;
sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n";
sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen;
buildInputs = [ pugixml wayland libGL ];
outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];
cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ];
meta = with stdenv.lib; {
description = "Wayland C++ binding";
homepage = "https://github.com/NilsBrause/waylandpp/";