diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 05:24:03 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 05:24:03 +0100 |
| commit | a69e30979460bec85a44a04690bfc7abcb1964ce (patch) | |
| tree | b0ed96260b67524e547a9c338bbfd72b34683e64 /pkgs/development/interpreters | |
| parent | 5aed91512da5e972289fbd0ecd3cf74efa7d81fe (diff) | |
| parent | 480fc1856a41800cde7f0b154f9bb0c3f8c4e27a (diff) | |
| download | nixlib-a69e30979460bec85a44a04690bfc7abcb1964ce.tar nixlib-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.gz nixlib-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.bz2 nixlib-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.lz nixlib-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.xz nixlib-a69e30979460bec85a44a04690bfc7abcb1964ce.tar.zst nixlib-a69e30979460bec85a44a04690bfc7abcb1964ce.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/elixir/generic-builder.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b7e98af21097..a11865571018 100644 --- 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 |