nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-26 14:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13880 from acowley/juliamac

Browse Source 
julia: darwin compatibility
This commit is contained in:
Thomas Tuegel 2016-03-13 10:38:04 -05:00
commit d39b1db400
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/julia/default.nix
View File

@ -7,6 +7,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;
@ -19,6 +21,9 @@ in
let let
arpack = arpack_.override { inherit openblas; }; arpack = arpack_.override { inherit openblas; };
suitesparse = suitesparse_.override { inherit openblas; }; suitesparse = suitesparse_.override { inherit openblas; };
llvmShared = if stdenv.isDarwin
then llvm.override { enableSharedLibraries = true; }
else llvm;
in in
let let
@ -68,10 +73,11 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
arpack fftw fftwSinglePrec gmp libgit2 libunwind llvm mpfr arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr
pcre2 openblas openlibm openspecfun readline suitesparse utf8proc pcre2 openblas openlibm openspecfun readline suitesparse utf8proc
zlib zlib
]; ] ++
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 ];
@ -127,6 +133,8 @@ stdenv.mkDerivation rec {
openspecfun pcre2 suitesparse openspecfun pcre2 suitesparse
]; ];
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;

9
pkgs/development/libraries/git2/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser}: {stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv}:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
version = "0.23.2"; version = "0.23.2";
name = "libgit2-${version}"; name = "libgit2-${version}";
@ -21,4 +21,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; all; platforms = with stdenv.lib.platforms; all;
}; };
} } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
NIX_LDFLAGS = "-liconv";
propagatedBuildInputs = [ libiconv ];
})

7
pkgs/top-level/all-packages.nix
View File

@ -4546,6 +4546,7 @@ let
julia = callPackage ../development/compilers/julia { julia = callPackage ../development/compilers/julia {
gmp = gmp6; gmp = gmp6;
openblas = openblasCompat; openblas = openblasCompat;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
}; };
julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix {
@ -6850,7 +6851,11 @@ let
gio-sharp = callPackage ../development/libraries/gio-sharp { }; gio-sharp = callPackage ../development/libraries/gio-sharp { };
libgit2 = callPackage ../development/libraries/git2 { }; libgit2 = callPackage ../development/libraries/git2 (
stdenv.lib.optionalAttrs stdenv.isDarwin {
inherit (darwin) libiconv;
}
);
libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { };