JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding camlp5 as a propogated build input to ulex 0.8

Browse Source 
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
This commit is contained in:
Russell O'Connor 2011-11-24 19:43:03 +00:00
parent 0d124624e8
commit 845f2a8658
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/logic/matita/default.nix
View File

@ -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)

2
pkgs/development/ocaml-modules/ulex/0.8/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation {
patches = [ ./meta_version.patch ./camlp5.patch ];
propagatedBuildInputs = [ camlp5 ];
buildFlags = "all all.opt";
meta = {

1
pkgs/top-level/all-packages.nix
View File

@ -8240,7 +8240,6 @@ let
matita = callPackage ../applications/science/logic/matita {
inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http
lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre;
camlp5 = ocamlPackages.camlp5_transitional;
};
minisat = callPackage ../applications/science/logic/minisat {};