public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

waylandpp: 0.2.5 -> 0.2.7, make it split-output package

This commit is contained in:
Minijackson 2019-11-01 14:01:02 +01:00
parent 929e67be69
commit 34999b030c
No known key found for this signature in database
GPG Key ID: FEA888C9F5D64F62
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 usbSupport libusb
++ lib.optional vdpauSupport libvdpau ++ lib.optional vdpauSupport libvdpau
++ lib.optionals useWayland [ ++ lib.optionals useWayland [
wayland waylandpp wayland waylandpp.dev
# Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
libxkbcommon.dev libxkbcommon.dev
] ]
@ -200,7 +200,7 @@ in stdenv.mkDerivation {
which which
pkgconfig gnumake pkgconfig gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 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 = [ cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}" "-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 { stdenv.mkDerivation rec {
pname = "waylandpp"; pname = "waylandpp";
version = "0.2.5"; version = "0.2.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NilsBrause"; owner = "NilsBrause";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"; sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen;
buildInputs = [ pugixml wayland libGL ]; buildInputs = [ pugixml wayland libGL ];
outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ];
cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Wayland C++ binding"; description = "Wayland C++ binding";
homepage = https://github.com/NilsBrause/waylandpp/; homepage = https://github.com/NilsBrause/waylandpp/;