diff options
author | Daiderd Jordan | 2017-09-21 21:51:32 +0200 |
---|---|---|
committer | Daiderd Jordan | 2017-09-21 21:52:10 +0200 |
commit | 7c30c83b7b09c41dda2f2766607a8376c91c3129 (patch) | |
tree | c53f6a50220af580fd3419b772eef68ba6afa25a /pkgs | |
parent | fe2e7def5341b0f5fe4661ae9853756600d4c384 (diff) |
vmmlib: fix darwin frameworks
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/vmmlib/default.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 3a7f8770e6c7..ccdf2b05e7e3 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/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"; @@ -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"; @@ -36,6 +41,6 @@ stdenv.mkDerivation rec { homepage = http://github.com/VMML/vmmlib/; maintainers = [ maintainers.adev ]; platforms = platforms.all; - }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acc753ce58ce..d65cf86dff51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |