From 8741df1ad84201f2771423e14c5c6b01ce299141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Sun, 10 May 2020 16:39:18 +0200
Subject: [PATCH] [Nix] Add which so that e-acsl can find sed
---
nix/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 386692ca727..ed3ac4e26b1 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -2,7 +2,7 @@
{ pkgs, stdenv, src ? ../., opam2nix, ocaml_version ? "ocaml-ng.ocamlPackages_4_05.ocaml", plugins ? { } }:
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"
{ name = "coq"; constraint = "=8.11.1"; }
{ name = "why3" ; constraint = "=1.3.1"; }
@@ -179,7 +179,7 @@ rec {
e-acsl-tests-dev = stdenv.mkDerivation {
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;
src = main.build_dir + "/dir.tar";
sourceRoot = ".";
@@ -203,7 +203,7 @@ rec {
name = "frama-c-internal";
inherit src;
buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ]; } ) ++
- [ pkgs.getopt pkgs.which
+ [ pkgs.getopt
pkgs.libxslt pkgs.libxml2 pkgs.autoPatchelfHook stdenv.cc.cc.lib
];
counter_examples_src = plugins.counter-examples.src;
--
GitLab