diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-12-14 10:52:31 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-12-21 12:37:04 +0100 |
| commit | e0561cbaddce35618cc941fb55e4964b85e45746 (patch) | |
| tree | a526b2fd759a192b6e207da23a4bb1f9e5e3b7a9 /pkgs/development/coq-modules | |
| parent | 1d5059c5e65e3a1b952885aabb0b9ea02290aebb (diff) | |
| download | nixpkgs-e0561cbaddce35618cc941fb55e4964b85e45746.tar nixpkgs-e0561cbaddce35618cc941fb55e4964b85e45746.tar.gz nixpkgs-e0561cbaddce35618cc941fb55e4964b85e45746.tar.bz2 nixpkgs-e0561cbaddce35618cc941fb55e4964b85e45746.tar.lz nixpkgs-e0561cbaddce35618cc941fb55e4964b85e45746.tar.xz nixpkgs-e0561cbaddce35618cc941fb55e4964b85e45746.tar.zst nixpkgs-e0561cbaddce35618cc941fb55e4964b85e45746.zip | |
coqPackages.Verdi: fix build
Diffstat (limited to 'pkgs/development/coq-modules')
| -rw-r--r-- | pkgs/development/coq-modules/Verdi/default.nix | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 9f54eb67c72..8eaa2bdfae7 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -1,32 +1,11 @@ -{ stdenv, fetchFromGitHub, coq, mathcomp, StructTact, InfSeqExt, Cheerios }: +{ stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }: -let params = +let param = { - "8.6" = { version = "20181102"; rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; - - "8.7" = { - version = "20181102"; - rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; - sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; - - "8.8" = { - version = "20181102"; - rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; - sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; - - "8.9" = { - version = "20181102"; - rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; - sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; - }; }; - param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -38,15 +17,16 @@ stdenv.mkDerivation rec { inherit (param) rev sha256; }; - buildInputs = [ - coq coq.ocaml coq.camlp5 coq.findlib mathcomp StructTact InfSeqExt Cheerios - ]; + buildInputs = [ coq ]; + propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ]; + 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.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; }; } |