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

Merge pull request #37033 from lukeadams/freenect-update

Browse Source 
freenect: 0.5.5 -> 0.5.7, Enable Darwin
This commit is contained in:
Jörg Thalheim 2018-03-18 11:26:24 +00:00 committed by GitHub
commit bcddd8bd2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/freenect/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "freenect-${version}"; name = "freenect-${version}";
version = "0.5.5"; version = "0.5.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenKinect"; owner = "OpenKinect";
repo = "libfreenect"; repo = "libfreenect";
rev = "v${version}"; 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 ]; nativeBuildInputs = [ cmake pkgconfig ];
meta = { meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
inherit version; inherit version;
homepage = http://openkinect.org; homepage = http://openkinect.org;
license = with stdenv.lib.licenses; [ gpl2 asl20 ]; license = with lib.licenses; [ gpl2 asl20 ];
maintainers = with stdenv.lib.maintainers; [ bennofs ]; maintainers = with lib.maintainers; [ bennofs ];
platforms = stdenv.lib.platforms.linux; platforms = with lib.platforms; linux ++ darwin ;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -8784,7 +8784,9 @@ with pkgs;
freeglut = callPackage ../development/libraries/freeglut { }; freeglut = callPackage ../development/libraries/freeglut { };
freenect = callPackage ../development/libraries/freenect { }; freenect = callPackage ../development/libraries/freenect {
inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;
};
freetype = callPackage ../development/libraries/freetype { }; freetype = callPackage ../development/libraries/freetype { };