From 34c59894a6a08518e82c4810f5447a9e8e138b39 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 17 Sep 2015 20:55:57 +0200 Subject: [PATCH] ocaml-mode: fix build for OCaml >= 4.02 --- pkgs/applications/editors/emacs-modes/ocaml/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 9e4496ff1a48..7ed6355f9815 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -11,7 +11,8 @@ in stdenv.mkDerivation { # a quick configure to get the Makefile generated. Since # we do not build the ocaml itself, we don't really # need it to support any features. - configureFlags = [ "-no-tk" "-no-curses" "-no-pthread" ]; + configureFlags = (with stdenv.lib; optional (!(versionAtLeast version "4.02")) "-no-tk") ++ + [ "-no-curses" "-no-pthread" ]; buildInputs = [ emacs ]; dontBuild = true;