Skip to content
Snippets Groups Projects
Commit 8741df1a authored by François Bobot's avatar François Bobot
Browse files

[Nix] Add which so that e-acsl can find sed

parent 93de82f6
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{ pkgs, stdenv, src ? ../., opam2nix, ocaml_version ? "ocaml-ng.ocamlPackages_4_05.ocaml", plugins ? { } }: { pkgs, stdenv, src ? ../., opam2nix, ocaml_version ? "ocaml-ng.ocamlPackages_4_05.ocaml", plugins ? { } }:
let mk_buildInputs = { opamPackages ? [], nixPackages ? [] } : let mk_buildInputs = { opamPackages ? [], nixPackages ? [] } :
[ pkgs.gnugrep pkgs.gnused pkgs.autoconf pkgs.gnumake pkgs.gcc pkgs.ncurses pkgs.time pkgs.python3 pkgs.perl pkgs.file] ++ nixPackages ++ opam2nix.build { [ pkgs.gnugrep pkgs.gnused pkgs.autoconf pkgs.gnumake pkgs.gcc pkgs.ncurses pkgs.time pkgs.python3 pkgs.perl pkgs.file pkgs.which] ++ nixPackages ++ opam2nix.build {
specs = opam2nix.toSpecs ([ "ocamlfind" "zarith" "ocamlgraph" "yojson" specs = opam2nix.toSpecs ([ "ocamlfind" "zarith" "ocamlgraph" "yojson"
{ name = "coq"; constraint = "=8.11.1"; } { name = "coq"; constraint = "=8.11.1"; }
{ name = "why3" ; constraint = "=1.3.1"; } { name = "why3" ; constraint = "=1.3.1"; }
...@@ -179,7 +179,7 @@ rec { ...@@ -179,7 +179,7 @@ rec {
e-acsl-tests-dev = stdenv.mkDerivation { e-acsl-tests-dev = stdenv.mkDerivation {
name = "frama-c-e-acsl-tests-dev"; name = "frama-c-e-acsl-tests-dev";
buildInputs = mk_buildInputs { nixPackages = [ pkgs.gmp pkgs.getopt pkgs.which ]; }; buildInputs = mk_buildInputs { nixPackages = [ pkgs.gmp pkgs.getopt ]; };
build_dir = main.build_dir; build_dir = main.build_dir;
src = main.build_dir + "/dir.tar"; src = main.build_dir + "/dir.tar";
sourceRoot = "."; sourceRoot = ".";
...@@ -203,7 +203,7 @@ rec { ...@@ -203,7 +203,7 @@ rec {
name = "frama-c-internal"; name = "frama-c-internal";
inherit src; inherit src;
buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ]; } ) ++ buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ]; } ) ++
[ pkgs.getopt pkgs.which [ pkgs.getopt
pkgs.libxslt pkgs.libxml2 pkgs.autoPatchelfHook stdenv.cc.cc.lib pkgs.libxslt pkgs.libxml2 pkgs.autoPatchelfHook stdenv.cc.cc.lib
]; ];
counter_examples_src = plugins.counter-examples.src; counter_examples_src = plugins.counter-examples.src;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment