Skip to content

Commit

Permalink
vmmlib: fix darwin frameworks
Browse files Browse the repository at this point in the history
  • Loading branch information
LnL7 committed Sep 21, 2017
1 parent fe2e7de commit 7c30c83
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
21 changes: 13 additions & 8 deletions pkgs/development/libraries/vmmlib/default.nix
@@ -1,9 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas
, Accelerate, CoreGraphics, CoreVideo
}:

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

src = fetchFromGitHub {
owner = "VMML";
Expand All @@ -12,13 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
};

patches = [
./disable-cpack.patch #disable the need of cpack/rpm
];

patches = [
./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;

doCheck = true;
doCheck = !stdenv.isDarwin;

checkTarget = "test";

Expand All @@ -36,6 +41,6 @@ stdenv.mkDerivation rec {
homepage = http://github.com/VMML/vmmlib/;
maintainers = [ maintainers.adev ];
platforms = platforms.all;
};
};
}

4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -7902,7 +7902,9 @@ with pkgs;

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 { };

Expand Down

0 comments on commit 7c30c83

Please sign in to comment.