diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2010-12-20 10:32:22 +0000 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2010-12-20 10:32:22 +0000 |
| commit | e7accaf8d36247216678c5f4870000a4a50236da (patch) | |
| tree | b33409b6310d842be4c8201ec7d7548df5c05d1d /pkgs/applications/science/logic | |
| parent | d3f00b9cf5436c5b137a6b3d62145185b3a8cf8d (diff) | |
| download | nixlib-e7accaf8d36247216678c5f4870000a4a50236da.tar nixlib-e7accaf8d36247216678c5f4870000a4a50236da.tar.gz nixlib-e7accaf8d36247216678c5f4870000a4a50236da.tar.bz2 nixlib-e7accaf8d36247216678c5f4870000a4a50236da.tar.lz nixlib-e7accaf8d36247216678c5f4870000a4a50236da.tar.xz nixlib-e7accaf8d36247216678c5f4870000a4a50236da.tar.zst nixlib-e7accaf8d36247216678c5f4870000a4a50236da.zip | |
* Update camlp5
svn path=/nixpkgs/trunk/; revision=25206
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index d72a2104370c..741b780a2377 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -1,7 +1,7 @@ # TODO: # - coqide compilation should be optional or (better) separate; -{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}: +{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}: let version = "8.3"; @@ -15,15 +15,17 @@ stdenv.mkDerivation { sha256 = "02iy4rxz1n1kc85fb3vs4xpxqfxjw87y2gvmi39fxrj8742qx0dx"; }; - buildInputs = [ ocaml camlp5 ncurses lablgtk ]; + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; prefixKey = "-prefix "; - configureFlags = - "-camldir ${ocaml}/bin " + - "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " + - "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " + - "-opt -coqide opt"; + preConfigure = '' + configureFlagsArray=( + -camldir ${ocaml}/bin + -camlp5dir $(ocamlfind query camlp5) + -lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 -opt -coqide opt + ) + ''; buildFlags = "world"; # Debug with "world VERBOSE=1"; |