summary refs log tree commit diff
path: root/pkgs/development/libraries/git2
diff options
context:
space:
mode:
authorAnthony Cowley <acowley@gmail.com>2016-03-13 04:18:16 -0400
committerAnthony Cowley <acowley@gmail.com>2016-03-13 04:18:16 -0400
commit889d6d11a3d93b920ea9ed63844d45f44f9f43e5 (patch)
treefe1d81c534d31898493c74dd4f8931d7cf06d8d2 /pkgs/development/libraries/git2
parent2d01e94f2e772c7ed587b188cf98369526b409fa (diff)
downloadnixpkgs-889d6d11a3d93b920ea9ed63844d45f44f9f43e5.tar
nixpkgs-889d6d11a3d93b920ea9ed63844d45f44f9f43e5.tar.gz
nixpkgs-889d6d11a3d93b920ea9ed63844d45f44f9f43e5.tar.bz2
nixpkgs-889d6d11a3d93b920ea9ed63844d45f44f9f43e5.tar.lz
nixpkgs-889d6d11a3d93b920ea9ed63844d45f44f9f43e5.tar.xz
nixpkgs-889d6d11a3d93b920ea9ed63844d45f44f9f43e5.tar.zst
nixpkgs-889d6d11a3d93b920ea9ed63844d45f44f9f43e5.zip
julia: darwin compatibility
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.
Diffstat (limited to 'pkgs/development/libraries/git2')
-rw-r--r--pkgs/development/libraries/git2/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 3c433511fc1..fb380d60cf9 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -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 ];
+})