From be5ec66d9e35bc9bfd0bf560c1a98755b7c924de Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Tue, 28 Oct 2014 17:41:45 -0400 Subject: [PATCH 1/2] Add libcec 2.1.4 --- pkgs/development/libraries/libcec/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libcec/default.nix diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix new file mode 100644 index 00000000000..6f19eb502d3 --- /dev/null +++ b/pkgs/development/libraries/libcec/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, udev }: + +let version = "2.1.4"; in + +stdenv.mkDerivation { + name = "libcec-${version}"; + + src = fetchurl { + url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; + sha256 = "0iz11zclbs3gk4ddq0pm4vyq015qmvy4nb9sra3vk6jw58izbgkr"; + }; + + buildInputs = [ autoreconfHook pkgconfig udev ]; + + meta = { + description = "USB CEC adapter communication library"; + homepage = "http://libcec.pulse-eight.com"; + repositories.git = "https://github.com/Pulse-Eight/libcec.git"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090929eba23..40a173e2117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5543,6 +5543,8 @@ let then libcanberra.override { gtk = null; } else libcanberra; + libcec = callPackage ../development/libraries/libcec { }; + libcello = callPackage ../development/libraries/libcello {}; libcdaudio = callPackage ../development/libraries/libcdaudio { }; From f6a734e9e0a7b2876e29a19dba711545ee23662b Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Tue, 28 Oct 2014 17:43:05 -0400 Subject: [PATCH 2/2] Add libcec support to xbmc --- pkgs/applications/video/xbmc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 404659208cf..a82abb22005 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -24,6 +24,7 @@ # TODO: librtmp , libvdpau ? null, vdpauSupport ? true , pulseaudio ? null, pulseSupport ? true +, libcec ? null, cecSupport ? true }: assert dbusSupport -> dbus_libs != null; @@ -32,6 +33,7 @@ assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used i assert sambaSupport -> samba != null; assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; assert pulseSupport -> pulseaudio != null; +assert cecSupport -> libcec != null; stdenv.mkDerivation rec { name = "xbmc-13.2"; @@ -65,7 +67,8 @@ stdenv.mkDerivation rec { ++ lib.optional usbSupport libusb ++ lib.optional sambaSupport samba ++ lib.optional vdpauSupport libvdpau - ++ lib.optional pulseSupport pulseaudio; + ++ lib.optional pulseSupport pulseaudio + ++ lib.optional cecSupport libcec; dontUseCmakeConfigure = true; @@ -91,7 +94,8 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ --prefix LD_LIBRARY_PATH ":" "${systemd}/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" done '';