diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 05:22:23 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 05:22:23 +0100 |
| commit | 480fc1856a41800cde7f0b154f9bb0c3f8c4e27a (patch) | |
| tree | e38cf54b9b20933eb91db7c1540b89a102e582a9 /pkgs/development/interpreters | |
| parent | fb6652529723cbb122111b588c01bdf62edbce42 (diff) | |
| parent | e1ee43f514fa8b510d8d3d142dc1ae83dee7716d (diff) | |
| download | nixpkgs-480fc1856a41800cde7f0b154f9bb0c3f8c4e27a.tar nixpkgs-480fc1856a41800cde7f0b154f9bb0c3f8c4e27a.tar.gz nixpkgs-480fc1856a41800cde7f0b154f9bb0c3f8c4e27a.tar.bz2 nixpkgs-480fc1856a41800cde7f0b154f9bb0c3f8c4e27a.tar.lz nixpkgs-480fc1856a41800cde7f0b154f9bb0c3f8c4e27a.tar.xz nixpkgs-480fc1856a41800cde7f0b154f9bb0c3f8c4e27a.tar.zst nixpkgs-480fc1856a41800cde7f0b154f9bb0c3f8c4e27a.zip | |
Merge branch 'master' into staging-next
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 b7e98af2109..a1186557101 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 |