From 29ac9bedf045cbfb8d2b9eaeb1e991cdf532f3bd Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sun, 30 Aug 2020 11:41:14 +0200 Subject: [PATCH] erlang: make `configureFlags` appending instead of overwriting The erlang `generic-builder` accepts a lot of arguments that would affect the `configureFlags` passed to `mkDerivation`. Though all these arguments would be without any effect if additionally `configureFlags` is passed and not the empty list. This change should make it easier to "compose" arbitrary erlang overrides. --- pkgs/development/interpreters/erlang/generic-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index af944e6fd14..a53a917b7b3 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -89,7 +89,8 @@ in stdenv.mkDerivation ({ ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" ++ optional withSystemd "--enable-systemd" - ++ optional stdenv.isDarwin "--enable-darwin-64bit"; + ++ optional stdenv.isDarwin "--enable-darwin-64bit" + ++ configureFlags; # install-docs will generate and install manpages and html docs # (PDFs are generated only when fop is available). @@ -131,7 +132,6 @@ in stdenv.mkDerivation ({ // optionalAttrs (postUnpack != "") { inherit postUnpack; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; }