diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-08-07 22:23:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 22:23:58 +0200 |
| commit | 44c354317d48eb97a726bceaa482be1db3836584 (patch) | |
| tree | 6b14db22ab2f98a488619f076a38c2e4acfbf0da /pkgs/development/interpreters | |
| parent | 2f9724e804188bfbdf184631795fb130930cb0ec (diff) | |
| parent | eaf9faef60ad4e927e5c9dc18550eb59fb2904ea (diff) | |
| download | nixlib-44c354317d48eb97a726bceaa482be1db3836584.tar nixlib-44c354317d48eb97a726bceaa482be1db3836584.tar.gz nixlib-44c354317d48eb97a726bceaa482be1db3836584.tar.bz2 nixlib-44c354317d48eb97a726bceaa482be1db3836584.tar.lz nixlib-44c354317d48eb97a726bceaa482be1db3836584.tar.xz nixlib-44c354317d48eb97a726bceaa482be1db3836584.tar.zst nixlib-44c354317d48eb97a726bceaa482be1db3836584.zip | |
Merge pull request #27911 from LnL7/erlang-no-gcc
erlang: remove explicit gcc dependency
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1fdfe4ca61dd..897f84f94ada 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook +, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport @@ -47,9 +47,9 @@ in stdenv.mkDerivation ({ inherit src version; - buildInputs = - [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc - ] + nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; + + buildInputs = [ gnum4 ncurses openssl autoreconfHook libxslt libxml2 ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages |