alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

julia-git: add macOS frameworks, hopefully that's useful

Browse source
This commit is contained in:
Michael Raskin 2016-11-26 22:41:32 +01:00
parent b47307bd74
commit db7e616b45
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/julia/git.nix
View file

@ -8,6 +8,8 @@
, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
# linear algebra # linear algebra
, openblas, arpack, suitesparse , openblas, arpack, suitesparse
# Darwin frameworks
, CoreServices, ApplicationServices
}: }:
with stdenv.lib; with stdenv.lib;
@ -80,7 +82,9 @@ stdenv.mkDerivation rec {
arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc
zlib llvm zlib llvm
]; ]
++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
;
nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];

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

@ -5052,6 +5052,7 @@ in
julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix {
gmp = gmp6; gmp = gmp6;
openblas = openblasCompat; openblas = openblasCompat;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
llvm = llvm_39; llvm = llvm_39;
}); });