diff options
| author | Guillaume Maudoux <guillaume.maudoux@uclouvain.be> | 2018-04-11 13:00:40 +0200 |
|---|---|---|
| committer | Guillaume Maudoux <guillaume.maudoux@uclouvain.be> | 2018-04-11 17:54:08 +0200 |
| commit | 2ddba49f59c3291014f7c765c5b6944bbddd2c26 (patch) | |
| tree | c6a1ba3b7d4eb6b85df928db1c5973cbcd3185fd /pkgs/applications/version-management/git-and-tools/git/default.nix | |
| parent | ad076ff7ce5ea04d7e890934440702e0228fc660 (diff) | |
| download | nixlib-2ddba49f59c3291014f7c765c5b6944bbddd2c26.tar nixlib-2ddba49f59c3291014f7c765c5b6944bbddd2c26.tar.gz nixlib-2ddba49f59c3291014f7c765c5b6944bbddd2c26.tar.bz2 nixlib-2ddba49f59c3291014f7c765c5b6944bbddd2c26.tar.lz nixlib-2ddba49f59c3291014f7c765c5b6944bbddd2c26.tar.xz nixlib-2ddba49f59c3291014f7c765c5b6944bbddd2c26.tar.zst nixlib-2ddba49f59c3291014f7c765c5b6944bbddd2c26.zip | |
git: fix perl libs path
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index de2c67ddc59d..f75515b1cc09 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -54,11 +54,19 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; - makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " - + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") - + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") - + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") - + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); + preBuild = '' + makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') ) + ''; + + makeFlags = stdenv.lib.concatStringsSep " " [ + "prefix=\${out}" + "PERL_PATH=${perl}/bin/perl" + "SHELL_PATH=${stdenv.shell}" + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then "INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") + (if stdenv.isDarwin then "NO_APPLE_COMMON_CRYPTO=1" else "sysconfdir=/etc/ ") + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "") + ]; # build git-credential-osxkeychain if darwin postBuild = stdenv.lib.optionalString stdenv.isDarwin '' |