Merge branch 'staging-next' into staging

2019-12-30 05:24:03 +01:00
parent 5aed91512d 480fc1856a
commit a69e309794
97 changed files with 971 additions and 402 deletions
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -10,7 +10,7 @@
 } @ args:

 let
-  inherit (stdenv.lib) getVersion versionAtLeast;
+  inherit (stdenv.lib) getVersion versionAtLeast optional;

 in
  assert versionAtLeast (getVersion erlang) minimumOTPVersion;
@@ -29,9 +29,7 @@ in

    inherit debugInfo;

-    buildFlags = if debugInfo
-      then "ERL_COMPILER_OPTIONS=debug_info"
-      else "";
+    buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info";

    preBuild = ''
      # The build process uses ./rebar. Link it to the nixpkgs rebar