diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/development/libraries/git2/default.nix | |
parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
download | nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/development/libraries/git2/default.nix')
-rw-r--r-- | pkgs/development/libraries/git2/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 4ec2903b900..3cf429ab1d7 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, pkgconfig, 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 ]; +}) |