summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2018-04-22 15:22:34 -0400
committerBen Gamari <ben@smart-cactus.org>2018-04-24 14:58:58 -0400
commitae0a14d25dfa8da22e20d5164c8243e32a34b44a (patch)
treee21638690b1369919ade7cc9266f4f395f594cf6 /pkgs/applications/version-management
parentcd2cb152be7bd25a0d8adc1f347b28365161890a (diff)
downloadnixlib-ae0a14d25dfa8da22e20d5164c8243e32a34b44a.tar
nixlib-ae0a14d25dfa8da22e20d5164c8243e32a34b44a.tar.gz
nixlib-ae0a14d25dfa8da22e20d5164c8243e32a34b44a.tar.bz2
nixlib-ae0a14d25dfa8da22e20d5164c8243e32a34b44a.tar.lz
nixlib-ae0a14d25dfa8da22e20d5164c8243e32a34b44a.tar.xz
nixlib-ae0a14d25dfa8da22e20d5164c8243e32a34b44a.tar.zst
nixlib-ae0a14d25dfa8da22e20d5164c8243e32a34b44a.zip
git: Refactor makeFlags using lib.optionals
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix13
1 files changed, 8 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 cf44cf5ef981..10b70626197e 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -56,11 +56,14 @@ 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 "");
+  makeFlags = [
+    "prefix=\${out}"
+    "SHELL_PATH=${stdenv.shell}"
+  ]
+  ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"])
+  ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
+  ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"])
+  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"];
 
   # build git-credential-osxkeychain if darwin
   postBuild = stdenv.lib.optionalString stdenv.isDarwin ''