diff options
| author | Domen Kožar <domen@dev.si> | 2020-04-22 13:12:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 13:12:06 +0200 |
| commit | ace7b9313181c4fc57fecd58880e467411355276 (patch) | |
| tree | 4bda3de731820e1daa85648942796e2a15386126 /pkgs/applications | |
| parent | 784aa2913ae8678fd26c8241db1d53e0e20ea13c (diff) | |
| parent | 34999b030cd7933b0ba1a3904be4370b68a42cf3 (diff) | |
| download | nixlib-ace7b9313181c4fc57fecd58880e467411355276.tar nixlib-ace7b9313181c4fc57fecd58880e467411355276.tar.gz nixlib-ace7b9313181c4fc57fecd58880e467411355276.tar.bz2 nixlib-ace7b9313181c4fc57fecd58880e467411355276.tar.lz nixlib-ace7b9313181c4fc57fecd58880e467411355276.tar.xz nixlib-ace7b9313181c4fc57fecd58880e467411355276.tar.zst nixlib-ace7b9313181c4fc57fecd58880e467411355276.zip | |
Merge pull request #72420 from minijackson/waylandpp-0.2.7
waylandpp: 0.2.5 -> 0.2.7, make it split-output package
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index d13dd3201a32..2354ba0f4090 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -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}" |