diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-12-21 15:14:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-12-21 15:14:33 +0000 |
| commit | c14382cb45678668422d9f368fbf7999eed94b7f (patch) | |
| tree | 8618c2d77e59bc89a0919baf2d406f5c80af8acd /pkgs/applications/science | |
| parent | c7de6bfeb39ecc84244dd25ad2038a7ba91c874a (diff) | |
| parent | e1a0b9472b0a39259d80050d5e73fd84b590febb (diff) | |
| download | nixlib-c14382cb45678668422d9f368fbf7999eed94b7f.tar nixlib-c14382cb45678668422d9f368fbf7999eed94b7f.tar.gz nixlib-c14382cb45678668422d9f368fbf7999eed94b7f.tar.bz2 nixlib-c14382cb45678668422d9f368fbf7999eed94b7f.tar.lz nixlib-c14382cb45678668422d9f368fbf7999eed94b7f.tar.xz nixlib-c14382cb45678668422d9f368fbf7999eed94b7f.tar.zst nixlib-c14382cb45678668422d9f368fbf7999eed94b7f.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
Diffstat (limited to 'pkgs/applications/science')
| -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 f63e03e9ad95..a804d9f84e6a 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"; |