From 56f053120baf37335ab8f23d7051fc3f4025117b Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 28 Oct 2015 17:36:27 -0700 Subject: [PATCH] erlang: remove nested lists --- pkgs/development/interpreters/erlang/R18.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index f2392f5f1f5..1e90ceadcdc 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper -, AppKit, Carbon, Cocoa +, Carbon, Cocoa , odbcSupport ? false, unixODBC ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null @@ -28,10 +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 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; + ] ++ 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 '';