From 23b5f0856988a487799a1d702bc0c0a88e4b2341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Thu, 29 Aug 2019 22:55:35 +0200
Subject: [PATCH] Use new helpers option
---
nix/default.nix | 4 +---
nix/frama-ci.nix | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 3525a599..24d4be50 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -7,7 +7,5 @@ plugins.helpers.simple_plugin
name = "frama-clang";
deps = [ pkgs.llvmPackages_7.clang-unwrapped pkgs.llvm_7 pkgs.gnused ];
opamPackages = [ "camlp4" ];
- postPatch = ''
- sed -i Makefile.config.in -e "s&@CLANG_INCDIR@&${pkgs.llvmPackages_7.clang-unwrapped}/include&"
- '';
+ configure_options = "-with-clang-includedir=${pkgs.llvmPackages_7.clang-unwrapped}";
}
diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix
index f91f77e3..edea5249 100644
--- a/nix/frama-ci.nix
+++ b/nix/frama-ci.nix
@@ -5,7 +5,7 @@ let
src = builtins.fetchGit {
"url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
"name" = "Frama-CI";
- "rev" = "8bb9694075309fb38c7d7cb28e831132de34ba04";
+ "rev" = "a99329415497d43b9bd263bbbbbded12e08f518b";
"ref" = "feature/frama-clang-ci";
};
in
--
GitLab