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

kodi: Fix libcec build

Browse Source
This commit is contained in:
Jonathan Rudenberg 2015-08-03 19:51:42 -04:00
parent c94bf0e8b1
commit 387517da84
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/video/kodi/default.nix
View File

@ -15,6 +15,7 @@
, lzo, libcdio, libmodplug, libass, libbluray , lzo, libcdio, libmodplug, libass, libbluray
, sqlite, mysql, nasm, gnutls, libva, wayland , sqlite, mysql, nasm, gnutls, libva, wayland
, curl, bzip2, zip, unzip, glxinfo, xdpyinfo , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
, libcec, libcec_platform
, dbus_libs ? null, dbusSupport ? true , dbus_libs ? null, dbusSupport ? true
, udev, udevSupport ? true , udev, udevSupport ? true
, libusb ? null, usbSupport ? false , libusb ? null, usbSupport ? false
@ -24,7 +25,6 @@
, rtmpdump ? null, rtmpSupport ? true , rtmpdump ? null, rtmpSupport ? true
, libvdpau ? null, vdpauSupport ? true , libvdpau ? null, vdpauSupport ? true
, libpulseaudio ? null, pulseSupport ? true , libpulseaudio ? null, pulseSupport ? true
, libcec ? null, cecSupport ? true
}: }:
assert dbusSupport -> dbus_libs != null; assert dbusSupport -> dbus_libs != null;
@ -33,7 +33,6 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i
assert sambaSupport -> samba != null; assert sambaSupport -> samba != null;
assert vdpauSupport -> libvdpau != null; assert vdpauSupport -> libvdpau != null;
assert pulseSupport -> libpulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert cecSupport -> libcec != null;
assert rtmpSupport -> rtmpdump != null; assert rtmpSupport -> rtmpdump != null;
let let
@ -69,6 +68,7 @@ in stdenv.mkDerivation rec {
lzo libcdio libmodplug libass libbluray lzo libcdio libmodplug libass libbluray
sqlite mysql.lib nasm avahi libdvdcss lame sqlite mysql.lib nasm avahi libdvdcss lame
curl bzip2 zip unzip glxinfo xdpyinfo curl bzip2 zip unzip glxinfo xdpyinfo
libcec libcec_platform
] ]
++ lib.optional dbusSupport dbus_libs ++ lib.optional dbusSupport dbus_libs
++ lib.optional udevSupport udev ++ lib.optional udevSupport udev
@ -76,7 +76,6 @@ in stdenv.mkDerivation rec {
++ lib.optional sambaSupport samba ++ lib.optional sambaSupport samba
++ lib.optional vdpauSupport libvdpau ++ lib.optional vdpauSupport libvdpau
++ lib.optional pulseSupport libpulseaudio ++ lib.optional pulseSupport libpulseaudio
++ lib.optional cecSupport libcec
++ lib.optional rtmpSupport rtmpdump; ++ lib.optional rtmpSupport rtmpdump;
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
@ -93,9 +92,7 @@ in stdenv.mkDerivation rec {
./bootstrap ./bootstrap
''; '';
configureFlags = [ configureFlags = [ ]
"--enable-external-libraries"
]
++ lib.optional (!sambaSupport) "--disable-samba" ++ lib.optional (!sambaSupport) "--disable-samba"
++ lib.optional vdpauSupport "--enable-vdpau" ++ lib.optional vdpauSupport "--enable-vdpau"
++ lib.optional pulseSupport "--enable-pulse" ++ lib.optional pulseSupport "--enable-pulse"
@ -112,6 +109,7 @@ in stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \ --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
--prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
--prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
done done
''; '';