From 390769312d558c71b6fa3711ba45fbb6086f5dc4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Jul 2020 10:35:18 +0200 Subject: coq_8_5: fix build (use gnumake 4.2) --- pkgs/applications/science/logic/coq/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science/logic') diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a10b34e0a609..51dc5fffdec8 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ stdenv, fetchFromGitHub, writeText, pkgconfig +{ stdenv, fetchFromGitHub, writeText, pkgconfig, gnumake42 , ocamlPackages, ncurses , buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") , glib, gnome3, wrapGAppsHook @@ -107,7 +107,9 @@ self = stdenv.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42 + ; buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ [ ocamlPackages.num ] -- cgit v1.2.3