diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-05-13 06:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-13 06:47:14 +0200 |
| commit | 1f11888116d74b814acd1071a2f49523bf2a4aa7 (patch) | |
| tree | 0c32d4aa2f6a64762b18860aa6dc2a780b2209b8 /pkgs/development/coq-modules/mathcomp/default.nix | |
| parent | 215235cce56b0a7322d52e6a94e65ec59dc83b7d (diff) | |
| download | nixpkgs-1f11888116d74b814acd1071a2f49523bf2a4aa7.tar nixpkgs-1f11888116d74b814acd1071a2f49523bf2a4aa7.tar.gz nixpkgs-1f11888116d74b814acd1071a2f49523bf2a4aa7.tar.bz2 nixpkgs-1f11888116d74b814acd1071a2f49523bf2a4aa7.tar.lz nixpkgs-1f11888116d74b814acd1071a2f49523bf2a4aa7.tar.xz nixpkgs-1f11888116d74b814acd1071a2f49523bf2a4aa7.tar.zst nixpkgs-1f11888116d74b814acd1071a2f49523bf2a4aa7.zip | |
Revert "coqPackages: etc"
This reverts commit 7e589a45ef86abf9a6a737d9730925b81ee663b4.
Diffstat (limited to 'pkgs/development/coq-modules/mathcomp/default.nix')
| -rw-r--r-- | pkgs/development/coq-modules/mathcomp/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index a19d8b8dcc7..0f562fec287 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -10,9 +10,9 @@ # See the documentation at doc/languages-frameworks/coq.section.md. # ############################################################################ -{ lib, ncurses, graphviz, lua, fetchzip, +{ lib, ncurses, which, graphviz, lua, fetchzip, mkCoqDerivation, recurseIntoAttrs, withDoc ? false, single ? false, - coqPackages, coq, version ? null }@args: + coqPackages, coq, ocamlPackages, version ? null }@args: with builtins // lib; let repo = "math-comp"; @@ -60,9 +60,8 @@ let inherit version pname defaultVersion release releaseRev repo owner; mlPlugin = versions.isLe "8.6" coq.coq-version; - nativeBuildInputs = optionals withDoc [ graphviz lua ]; - buildInputs = [ ncurses ]; - propagatedBuildInputs = mathcomp-deps; + extraNativeBuildInputs = [ which ] ++ optionals withDoc [ graphviz lua ]; + extraBuildInputs = [ ncurses ] ++ mathcomp-deps; buildFlags = optional withDoc "doc"; |