public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erlang: remove nested lists

This commit is contained in:
Jude Taylor 2015-10-28 17:36:27 -07:00
parent 3b2b2ab046
commit 56f053120b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/erlang/R18.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl { stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper , gnused, gawk, makeWrapper
, AppKit, Carbon, Cocoa , Carbon, Cocoa
, odbcSupport ? false, unixODBC ? null , odbcSupport ? false, unixODBC ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
, javacSupport ? false, openjdk ? null , javacSupport ? false, openjdk ? null
@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ perl gnum4 ncurses openssl makeWrapper [ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
++ optional odbcSupport [ unixODBC ] ++ optional odbcSupport unixODBC
++ optional javacSupport [ openjdk ] ++ optional javacSupport openjdk
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';