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

libgit2: fix darwin build

Browse Source
This commit is contained in:
Daiderd Jordan 2017-11-09 20:12:54 +01:00
parent d03678c227
commit 9f4024c05d
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/git2/0.25.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python { 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"; version = "0.25.1";
name = "libgit2-${version}"; name = "libgit2-${version}";
@ -13,11 +14,14 @@ stdenv.mkDerivation (rec {
sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj"; sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj";
}; };
cmakeFlags = "-DTHREADSAFE=ON"; cmakeFlags = [ "-DTHREADSAFE=ON" ];
nativeBuildInputs = [ cmake python pkgconfig ]; 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; enableParallelBuilding = true;
@ -27,7 +31,4 @@ 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 ];
})

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

@ -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 { stdenv.mkDerivation (rec {
name = "libgit2-${version}"; name = "libgit2-${version}";
@ -12,11 +15,14 @@ stdenv.mkDerivation (rec {
sha256 = "0zrrmfkfhd2xb4879z5khjb6xsdklrm01f1lscrs2ks68v25fk78"; sha256 = "0zrrmfkfhd2xb4879z5khjb6xsdklrm01f1lscrs2ks68v25fk78";
}; };
cmakeFlags = "-DTHREADSAFE=ON"; cmakeFlags = [ "-DTHREADSAFE=ON" ];
nativeBuildInputs = [ cmake python pkgconfig ]; 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; enableParallelBuilding = true;
@ -27,6 +33,4 @@ stdenv.mkDerivation (rec {
platforms = with platforms; all; platforms = with platforms; all;
}; };
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
NIX_LDFLAGS = "-liconv";
propagatedBuildInputs = [ libiconv ];
}) })

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

@ -8300,13 +8300,15 @@ with pkgs;
icon-lang = callPackage ../development/interpreters/icon-lang { }; icon-lang = callPackage ../development/interpreters/icon-lang { };
inherit (rec { libgit2 = callPackage ../development/libraries/git2 {
arg = stdenv.lib.optionalAttrs stdenv.isDarwin {
inherit (darwin) libiconv; inherit (darwin) libiconv;
inherit (darwin.apple_sdk.frameworks) Security;
};
libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix {
inherit (darwin) libiconv;
inherit (darwin.apple_sdk.frameworks) Security;
}; };
libgit2 = callPackage ../development/libraries/git2 arg;
libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix arg;
}) libgit2 libgit2_0_25;
gle = callPackage ../development/libraries/gle { }; gle = callPackage ../development/libraries/gle { };