diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-03 11:01:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-03 11:01:57 +0000 |
| commit | 696d85a62d8418e8b33f5f95b932b82706f8d338 (patch) | |
| tree | 7afed180c5eb396a567c5a20a4a59859299c6f14 /pkgs/development/interpreters/erlang | |
| parent | 5df521abdabe5d294811b9824a5839b1ebbd3127 (diff) | |
| parent | b8755a4cdf8dd426ac642c006825d302dfe5f4b1 (diff) | |
| download | nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.gz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.bz2 nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.lz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.xz nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.tar.zst nixlib-696d85a62d8418e8b33f5f95b932b82706f8d338.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/interpreters/erlang')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R17.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index e06b2741d35c..8096ca555a44 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper +, Carbon, Cocoa , odbcSupport ? false, unixODBC ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null @@ -27,9 +28,10 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport [ unixODBC ] - ++ optional javacSupport [ openjdk ]; + ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) + ++ optional odbcSupport unixODBC + ++ optional javacSupport openjdk + ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; |