Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-15 14:41:01 +00:00
parent 0761573507 f402c6321a
commit 5185bc1773
1603 changed files with 132258 additions and 39568 deletions
@@ -3,6 +3,7 @@
 , selinuxSupport? false, libselinux ? null, libsepol ? null
 , autoconf, automake114x, texinfo
 , withPrefix ? false
+, singleBinary ? "symlinks" # you can also pass "shebangs" or false
 }:

 assert aclSupport -> acl != null;
@@ -35,7 +36,10 @@ let
    outputs = [ "out" "info" ];

    nativeBuildInputs = [ perl xz.bin ];
-    configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no";
+    configureFlags =
+      optional (singleBinary != false)
+        ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
+      ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no";

    buildInputs = [ gmp ]
      ++ optional aclSupport acl