From 5a12bedbfa2dae4412986363d7e1a4aba1416a77 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Dec 2018 10:52:14 +0000 Subject: [PATCH] coqPackages.StructTact: fix build --- .../coq-modules/StructTact/default.nix | 39 +++---------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 1fd6187e049d..55d59b931404 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -1,38 +1,11 @@ { stdenv, fetchFromGitHub, coq, mathcomp }: -let params = +let param = { - "8.5" = { version = "20181102"; rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.6" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.7" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.8" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; - - "8.9" = { - version = "20181102"; - rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; - sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - }; }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -44,15 +17,15 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib - ]; + buildInputs = [ coq ]; + enableParallelBuilding = true; - buildPhase = "make -j$NIX_BUILD_CORES"; + preConfigure = "patchShebangs ./configure"; + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; }; }