From fbbd88017f1eafae02202f89d8ce28a52a221ba1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 7 Nov 2014 09:50:39 +0000 Subject: [PATCH] zarith: propagate build input gmp --- pkgs/applications/science/logic/alt-ergo/default.nix | 4 ++-- pkgs/development/ocaml-modules/zarith/default.nix | 3 ++- pkgs/development/tools/analysis/frama-c/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 62359baf2bc..ca1602d6e58 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ocaml, ocamlPackages, gmp }: +{ fetchurl, stdenv, ocaml, ocamlPackages }: stdenv.mkDerivation rec { name = "alt-ergo-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = with ocamlPackages; - [ ocaml findlib ocamlgraph zarith lablgtk gmp ]; + [ ocaml findlib ocamlgraph zarith lablgtk ]; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 2f679da977d..ccd278a2faa 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; }; - buildInputs = [ ocaml findlib pkgconfig gmp perl ]; + buildInputs = [ ocaml findlib pkgconfig perl ]; + propagatedBuildInputs = [ gmp ]; patchPhase = '' substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index baa63855a0a..9e2f310b8a1 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, ocamlPackages, graphviz -, ltl2ba, coq, alt-ergo, gmp, why3 }: +, ltl2ba, coq, alt-ergo, why3 }: stdenv.mkDerivation rec { name = "frama-c-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = with ocamlPackages; [ - ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph gmp + ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph lablgtk coq graphviz zarith why3 zarith ];