diff options
| author | Russell O'Connor <roconnor@theorem.ca> | 2011-11-24 19:43:03 +0000 |
|---|---|---|
| committer | Russell O'Connor <roconnor@theorem.ca> | 2011-11-24 19:43:03 +0000 |
| commit | 845f2a8658af89c96c66a5989cf383a09ba8c56e (patch) | |
| tree | 8907b877f664313d95320a74635a5e32c036db91 /pkgs/applications/science/logic | |
| parent | 0d124624e8bc2e44e30a5acea50b45f3d979799e (diff) | |
| download | nixlib-845f2a8658af89c96c66a5989cf383a09ba8c56e.tar nixlib-845f2a8658af89c96c66a5989cf383a09ba8c56e.tar.gz nixlib-845f2a8658af89c96c66a5989cf383a09ba8c56e.tar.bz2 nixlib-845f2a8658af89c96c66a5989cf383a09ba8c56e.tar.lz nixlib-845f2a8658af89c96c66a5989cf383a09ba8c56e.tar.xz nixlib-845f2a8658af89c96c66a5989cf383a09ba8c56e.tar.zst nixlib-845f2a8658af89c96c66a5989cf383a09ba8c56e.zip | |
adding camlp5 as a propogated build input to ulex 0.8
matita and ulex must build against the same version of camlp5, so in an attempt to force them to always be the same I am adding a propgatedBuildInput to ulex. Granted Matita still requires camlp5_traditional and this is less obvious in the matita file now, so I am not entirely sure this is the right design choice. svn path=/nixpkgs/trunk/; revision=30552
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/matita/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 6ac672193e27..92e9479d9a44 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, camlp5, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: +{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh"; }; - buildInputs = [ocaml camlp5 findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ]; + buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ]; postPatch = '' BASH=$(type -tp bash) |