diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-11-09 20:12:54 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-11-09 21:45:06 +0100 |
| commit | 9f4024c05d57f93324762850961865cbb231680e (patch) | |
| tree | 1045e036533cab9344cdcc6c8894cc3fc9112995 /pkgs/development/libraries/git2 | |
| parent | d03678c227bf40192a353939c61cb533c7abe5a0 (diff) | |
| download | nixpkgs-9f4024c05d57f93324762850961865cbb231680e.tar nixpkgs-9f4024c05d57f93324762850961865cbb231680e.tar.gz nixpkgs-9f4024c05d57f93324762850961865cbb231680e.tar.bz2 nixpkgs-9f4024c05d57f93324762850961865cbb231680e.tar.lz nixpkgs-9f4024c05d57f93324762850961865cbb231680e.tar.xz nixpkgs-9f4024c05d57f93324762850961865cbb231680e.tar.zst nixpkgs-9f4024c05d57f93324762850961865cbb231680e.zip | |
libgit2: fix darwin build
Diffstat (limited to 'pkgs/development/libraries/git2')
| -rw-r--r-- | pkgs/development/libraries/git2/0.25.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/git2/default.nix | 14 |
2 files changed, 18 insertions, 13 deletions
diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix index 679049a0e13..9743b82a14a 100644 --- a/pkgs/development/libraries/git2/0.25.nix +++ b/pkgs/development/libraries/git2/0.25.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, python -, zlib, libssh2, openssl, http-parser, curl, libiconv +, zlib, libssh2, openssl, http-parser, curl +, libiconv, Security }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { version = "0.25.1"; name = "libgit2-${version}"; @@ -13,11 +14,14 @@ stdenv.mkDerivation (rec { sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj"; }; - cmakeFlags = "-DTHREADSAFE=ON"; + cmakeFlags = [ "-DTHREADSAFE=ON" ]; nativeBuildInputs = [ cmake python pkgconfig ]; - buildInputs = [ zlib libssh2 openssl http-parser curl ]; + buildInputs = [ zlib libssh2 openssl http-parser curl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; enableParallelBuilding = true; @@ -27,7 +31,4 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; -} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { - NIX_LDFLAGS = "-liconv"; - propagatedBuildInputs = [ libiconv ]; -}) +} diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 42cf181f84f..c0659a79fd3 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake +, zlib, python, libssh2, openssl, curl, http-parser +, libiconv, Security +}: stdenv.mkDerivation (rec { name = "libgit2-${version}"; @@ -12,11 +15,14 @@ stdenv.mkDerivation (rec { sha256 = "0zrrmfkfhd2xb4879z5khjb6xsdklrm01f1lscrs2ks68v25fk78"; }; - cmakeFlags = "-DTHREADSAFE=ON"; + cmakeFlags = [ "-DTHREADSAFE=ON" ]; nativeBuildInputs = [ cmake python pkgconfig ]; - buildInputs = [ zlib libssh2 openssl http-parser curl ]; + buildInputs = [ zlib libssh2 openssl http-parser curl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) [ libiconv ]; enableParallelBuilding = true; @@ -27,6 +33,4 @@ stdenv.mkDerivation (rec { platforms = with platforms; all; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { - NIX_LDFLAGS = "-liconv"; - propagatedBuildInputs = [ libiconv ]; }) |