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

vmmlib: fix darwin frameworks

Browse Source
This commit is contained in:
Daiderd Jordan 2017-09-21 21:51:32 +02:00
parent fe2e7def53
commit 7c30c83b7b
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/vmmlib/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas }: { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas
, Accelerate, CoreGraphics, CoreVideo
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6.2"; version = "1.6.2";
name = "vmmlib-${version}"; name = "vmmlib-${version}";
buildInputs = [ stdenv pkgconfig cmake boost blas ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "VMML"; owner = "VMML";
@ -12,13 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml"; sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
}; };
patches = [ patches = [
./disable-cpack.patch #disable the need of cpack/rpm ./disable-cpack.patch #disable the need of cpack/rpm
]; ];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ boost blas ]
++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = !stdenv.isDarwin;
checkTarget = "test"; checkTarget = "test";
@ -36,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = http://github.com/VMML/vmmlib/; homepage = http://github.com/VMML/vmmlib/;
maintainers = [ maintainers.adev ]; maintainers = [ maintainers.adev ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

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

@ -7902,7 +7902,9 @@ with pkgs;
eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
vmmlib = callPackage ../development/libraries/vmmlib {}; vmmlib = callPackage ../development/libraries/vmmlib {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
};
elastix = callPackage ../development/libraries/science/biology/elastix { }; elastix = callPackage ../development/libraries/science/biology/elastix { };