diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-12-14 10:52:20 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-12-21 12:37:04 +0100 |
| commit | 954bc20786ad3299dfc0c32dc608e9ed28d4926e (patch) | |
| tree | c2d56ebe801a37151381d525ef0b5dfdae899264 /pkgs/development/coq-modules | |
| parent | 5a12bedbfa2dae4412986363d7e1a4aba1416a77 (diff) | |
| download | nixpkgs-954bc20786ad3299dfc0c32dc608e9ed28d4926e.tar nixpkgs-954bc20786ad3299dfc0c32dc608e9ed28d4926e.tar.gz nixpkgs-954bc20786ad3299dfc0c32dc608e9ed28d4926e.tar.bz2 nixpkgs-954bc20786ad3299dfc0c32dc608e9ed28d4926e.tar.lz nixpkgs-954bc20786ad3299dfc0c32dc608e9ed28d4926e.tar.xz nixpkgs-954bc20786ad3299dfc0c32dc608e9ed28d4926e.tar.zst nixpkgs-954bc20786ad3299dfc0c32dc608e9ed28d4926e.zip | |
coqPackages.Cheerios: fix build
Diffstat (limited to 'pkgs/development/coq-modules')
| -rw-r--r-- | pkgs/development/coq-modules/Cheerios/default.nix | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 217c2ad5344..2429ccf3cf6 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -1,32 +1,11 @@ { stdenv, fetchFromGitHub, coq, StructTact }: -let params = +let param = { - "8.6" = { version = "20181102"; rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; - - "8.7" = { - version = "20181102"; - rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; - sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; - - "8.8" = { - version = "20181102"; - rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; - sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; - - "8.9" = { - version = "20181102"; - rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; - sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; - }; }; - 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 StructTact - ]; + buildInputs = [ coq ]; + + propagatedBuildInputs = [ StructTact ]; 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"; }; } |