ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96668 from NobbZ/erlang-config-flags

Browse Source 
erlang: make `configureFlags` appending instead of overwriting
This commit is contained in:
WORLDofPEACE 2020-09-08 19:41:17 -04:00 committed by GitHub
commit f764549bc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -89,7 +89,8 @@ in stdenv.mkDerivation ({
++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional odbcSupport "--with-odbc=${unixODBC}"
++ optional wxSupport "--enable-wx" ++ optional wxSupport "--enable-wx"
++ optional withSystemd "--enable-systemd" ++ 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 # install-docs will generate and install manpages and html docs
# (PDFs are generated only when fop is available). # (PDFs are generated only when fop is available).
@ -131,7 +132,6 @@ in stdenv.mkDerivation ({
// optionalAttrs (postUnpack != "") { inherit postUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; }
// optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patches != []) { inherit patches; }
// optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (patchPhase != "") { inherit patchPhase; }
// optionalAttrs (configureFlags != []) { inherit configureFlags; }
// optionalAttrs (configurePhase != "") { inherit configurePhase; } // optionalAttrs (configurePhase != "") { inherit configurePhase; }
// optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (preConfigure != "") { inherit preConfigure; }
// optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; }