Skip to content

Commit 6c34d1d

Browse files
committedSep 21, 2017
vmmlib: fix darwin frameworks
(cherry picked from commit 7c30c83)
1 parent 1f60b1e commit 6c34d1d

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed
 

‎pkgs/development/libraries/vmmlib/default.nix

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas }:
1+
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas
2+
, Accelerate, CoreGraphics, CoreVideo
3+
}:
24

35
stdenv.mkDerivation rec {
46
version = "1.6.2";
57
name = "vmmlib-${version}";
6-
buildInputs = [ stdenv pkgconfig cmake boost blas ];
78

89
src = fetchFromGitHub {
910
owner = "VMML";
@@ -12,13 +13,17 @@ stdenv.mkDerivation rec {
1213
sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
1314
};
1415

15-
patches = [
16-
./disable-cpack.patch #disable the need of cpack/rpm
17-
];
18-
16+
patches = [
17+
./disable-cpack.patch #disable the need of cpack/rpm
18+
];
19+
20+
nativeBuildInputs = [ pkgconfig cmake ];
21+
buildInputs = [ boost blas ]
22+
++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ];
23+
1924
enableParallelBuilding = true;
2025

21-
doCheck = true;
26+
doCheck = !stdenv.isDarwin;
2227

2328
checkTarget = "test";
2429

@@ -36,6 +41,6 @@ stdenv.mkDerivation rec {
3641
homepage = http://github.com/VMML/vmmlib/;
3742
maintainers = [ maintainers.adev ];
3843
platforms = platforms.all;
39-
};
44+
};
4045
}
4146

‎pkgs/top-level/all-packages.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -7875,7 +7875,9 @@ with pkgs;
78757875

78767876
eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
78777877

7878-
vmmlib = callPackage ../development/libraries/vmmlib {};
7878+
vmmlib = callPackage ../development/libraries/vmmlib {
7879+
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
7880+
};
78797881

78807882
elastix = callPackage ../development/libraries/science/biology/elastix { };
78817883

0 commit comments

Comments
 (0)
Please sign in to comment.