From c94bf0e8b160ae0261892c27bec7c2b6b9e96a92 Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Mon, 3 Aug 2015 19:50:54 -0400 Subject: [PATCH] libcec: 2.2.0 -> 3.0.1 Also adds the libcec_platform library which is a new dependency. --- pkgs/development/libraries/libcec/default.nix | 12 ++++++---- .../development/libraries/libcec/platform.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/libcec/platform.nix diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 6eca14767c5..94b483e1f5d 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, udev }: +{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }: -let version = "2.2.0"; in +let version = "3.0.1"; in stdenv.mkDerivation { name = "libcec-${version}"; src = fetchurl { - url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}-repack.tar.gz"; - sha256 = "1kdfak8y96v14d5vp2apkjjs0fvvim9phc0nkhlq5pjlagk8v32x"; + url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; + sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky"; }; - buildInputs = [ autoreconfHook pkgconfig udev ]; + buildInputs = [ cmake pkgconfig udev libcec_platform ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; # Fix dlopen path patchPhase = '' diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix new file mode 100644 index 00000000000..6db2656c9f4 --- /dev/null +++ b/pkgs/development/libraries/libcec/platform.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake }: + +let version = "1.0.10"; in + +stdenv.mkDerivation { + name = "libcec-${version}"; + + src = fetchurl { + url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz"; + sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Platform library for libcec and Kodi addons"; + homepage = "https://github.com/Pulse-Eight/platform"; + repositories.git = "https://github.com/Pulse-Eight/libcec.git"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.titanous ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d732e140668..72080fa3de1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6764,6 +6764,7 @@ let else libcanberra; libcec = callPackage ../development/libraries/libcec { }; + libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; libcello = callPackage ../development/libraries/libcello {};