Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 784aa2913ae8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ace7b9313181
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 6, 2020

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

    @minijackson
    minijackson committed Apr 6, 2020
    Copy the full SHA
    34999b0 View commit details

Commits on Apr 22, 2020

  1. Merge pull request #72420 from minijackson/waylandpp-0.2.7 

    waylandpp: 0.2.5 -> 0.2.7, make it split-output package
    @domenkozar
    domenkozar authored Apr 22, 2020
    Copy the full SHA
    ace7b93 View commit details
Showing with 14 additions and 6 deletions.
  1. +2 −2 pkgs/applications/video/kodi/default.nix
  2. +12 −4 pkgs/development/libraries/waylandpp/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/video/kodi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 12 additions & 4 deletions pkgs/development/libraries/waylandpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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/";