cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #105609 from bcdarwin/darwin-unbreak-ants

Browse source 
ants: unbreak on Darwin
This commit is contained in:
Sandro 2020-12-02 02:03:07 +01:00 committed by GitHub
commit 053e67e81e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/science/biology/ants/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7 }: { stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ANTs"; pname = "ANTs";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ itk4 vtk_7 ]; buildInputs = [ itk4 vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];

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

@ -26352,7 +26352,9 @@ in
alliance = callPackage ../applications/science/electronics/alliance { }; alliance = callPackage ../applications/science/electronics/alliance { };
ants = callPackage ../applications/science/biology/ants { }; ants = callPackage ../applications/science/biology/ants {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
aragorn = callPackage ../applications/science/biology/aragorn { }; aragorn = callPackage ../applications/science/biology/aragorn { };