public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

julia: darwin compatibility

Browse Source 
Along with PR #13879, these patches let julia build and run on
darwin. Using an llvm with shared library support is an idea adopted from
a @pikajude comment here https://github.com/NixOS/nixpkgs/issues/10864

The libgit2 change is mechanical to pull in iconv on darwin.

The frameworks are referenced by julia's build system.
This commit is contained in:
Anthony Cowley
2016-03-13 04:18:16 -04:00
parent 2d01e94f2e
commit 889d6d11a3
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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";
name = "libgit2-${version}";
@@ -21,4 +21,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; all;
};
}
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
NIX_LDFLAGS = "-liconv";
propagatedBuildInputs = [ libiconv ];
})