From 845f2a8658af89c96c66a5989cf383a09ba8c56e Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 24 Nov 2011 19:43:03 +0000 Subject: [PATCH] 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 --- pkgs/applications/science/logic/matita/default.nix | 4 ++-- pkgs/development/ocaml-modules/ulex/0.8/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 6ac672193e2..92e9479d9a4 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) diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index 169f3bfad8c..e996b6223b1 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { patches = [ ./meta_version.patch ./camlp5.patch ]; + propagatedBuildInputs = [ camlp5 ]; + buildFlags = "all all.opt"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef1bae59922..789edc93593 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {};