summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorlethalman <lucabru@src.gnome.org>2015-08-06 11:49:24 +0200
committerlethalman <lucabru@src.gnome.org>2015-08-06 11:49:24 +0200
commita0f50b487e38a5dfae4d15d2404605d156239e09 (patch)
tree1d033e3cb97d359f5141ad65c37607ba4b422c27 /pkgs/development
parentdad54b36fbc0635c99523e585ef0808aff4f5db5 (diff)
parent387517da84ea88dceae4254403995dbe56bedcf5 (diff)
downloadnixpkgs-a0f50b487e38a5dfae4d15d2404605d156239e09.tar
nixpkgs-a0f50b487e38a5dfae4d15d2404605d156239e09.tar.gz
nixpkgs-a0f50b487e38a5dfae4d15d2404605d156239e09.tar.bz2
nixpkgs-a0f50b487e38a5dfae4d15d2404605d156239e09.tar.lz
nixpkgs-a0f50b487e38a5dfae4d15d2404605d156239e09.tar.xz
nixpkgs-a0f50b487e38a5dfae4d15d2404605d156239e09.tar.zst
nixpkgs-a0f50b487e38a5dfae4d15d2404605d156239e09.zip
Merge pull request #9108 from titanous/libcec3
libcec 3.0
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/libcec/default.nix12
-rw-r--r--pkgs/development/libraries/libcec/platform.nix23
2 files changed, 30 insertions, 5 deletions
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 ];
+  };
+}