summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-03-18 11:26:24 +0000
committerGitHub <noreply@github.com>2018-03-18 11:26:24 +0000
commitbcddd8bd2a0eed9129f53e0f31aba2c9a726dafa (patch)
tree38fc47fe53e7b04d731e3152e140fc7d2e8f9e40 /pkgs/development/libraries
parenta7fea814ba735ab74d99342b3e9c87dbfb755dd7 (diff)
parent4576ff80124b6b5c58bf964b963efa08ecacf6c9 (diff)
downloadnixpkgs-bcddd8bd2a0eed9129f53e0f31aba2c9a726dafa.tar
nixpkgs-bcddd8bd2a0eed9129f53e0f31aba2c9a726dafa.tar.gz
nixpkgs-bcddd8bd2a0eed9129f53e0f31aba2c9a726dafa.tar.bz2
nixpkgs-bcddd8bd2a0eed9129f53e0f31aba2c9a726dafa.tar.lz
nixpkgs-bcddd8bd2a0eed9129f53e0f31aba2c9a726dafa.tar.xz
nixpkgs-bcddd8bd2a0eed9129f53e0f31aba2c9a726dafa.tar.zst
nixpkgs-bcddd8bd2a0eed9129f53e0f31aba2c9a726dafa.zip
Merge pull request #37033 from lukeadams/freenect-update
freenect: 0.5.5 -> 0.5.7, Enable Darwin
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/freenect/default.nix18
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index d6767a4cbd3..3771880d360 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu }:
+{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu
+, GLUT, Cocoa
+ }:
 
 stdenv.mkDerivation rec {
   name = "freenect-${version}";
-  version = "0.5.5";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "OpenKinect";
     repo = "libfreenect";
     rev = "v${version}";
-    sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx";
+    sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
   };
 
-  buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ];
+  buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ]
+    ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
+
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = {
     description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
     inherit version;
     homepage = http://openkinect.org;
-    license = with stdenv.lib.licenses; [ gpl2 asl20 ];
-    maintainers = with stdenv.lib.maintainers; [ bennofs ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with lib.licenses; [ gpl2 asl20 ];
+    maintainers = with lib.maintainers; [ bennofs ];
+    platforms = with lib.platforms; linux ++ darwin ;
   };
 }