summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorvbgl <vbgl@users.noreply.github.com>2017-02-19 15:54:54 +0100
committerGitHub <noreply@github.com>2017-02-19 15:54:54 +0100
commitd31577cfd3fb6219f3713d2537fdaa49b70165bc (patch)
tree196ca1fe5d4e69c9c15078fa18255eee6fcec15b /pkgs/development/tools
parente5e1bdca538cb2b8c0e1b184b4acb33649ad3270 (diff)
parent4c5f083d7016c737d321bbe8ac65adf73cc125ee (diff)
downloadnixlib-d31577cfd3fb6219f3713d2537fdaa49b70165bc.tar
nixlib-d31577cfd3fb6219f3713d2537fdaa49b70165bc.tar.gz
nixlib-d31577cfd3fb6219f3713d2537fdaa49b70165bc.tar.bz2
nixlib-d31577cfd3fb6219f3713d2537fdaa49b70165bc.tar.lz
nixlib-d31577cfd3fb6219f3713d2537fdaa49b70165bc.tar.xz
nixlib-d31577cfd3fb6219f3713d2537fdaa49b70165bc.tar.zst
nixlib-d31577cfd3fb6219f3713d2537fdaa49b70165bc.zip
Merge pull request #22871 from FlorentBecker/default_ocaml_402
Default ocaml 402
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/analysis/frama-c/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index a1239c6a1216..14efe29442bc 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with ocamlPackages; [
     ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
-    lablgtk coq graphviz zarith why3 apron
+    lablgtk coq graphviz zarith why3 apron camlp4
   ];
 
 
@@ -56,13 +56,15 @@ stdenv.mkDerivation rec {
   patches = [ ./dynamic.diff ];
   postPatch = ''
     # strip absolute paths to /usr/bin
-    for file in ./configure ./share/Makefile.common ./src/*/configure; do
+    for file in ./configure ./share/Makefile.common ./src/*/configure; do #*/
       substituteInPlace $file  --replace '/usr/bin/' ""
     done
 
     substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba'
 
     cd ../why*
+
+    substituteInPlace ./Makefile.in --replace '-warn-error A' '-warn-error A-3'    
     substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c"
     substituteInPlace ./jc/jc_make.ml --replace ' why-dp '       " $out/bin/why-dp "
     substituteInPlace ./jc/jc_make.ml --replace "?= why@\n"      "?= $out/bin/why@\n"