diff --git a/nix/frama-c.nix b/nix/frama-c.nix index f871052ebf2c8c0d043e4873fdb31ac729a7bea0..347ca1f1225f16a076bd463f305311197f51af10 100644 --- a/nix/frama-c.nix +++ b/nix/frama-c.nix @@ -1,6 +1,6 @@ # Nix { lib -, stdenv +, stdenvNoCC # for E-ACSL , fetchurl , gitignoreSource , makeWrapper @@ -15,6 +15,7 @@ , camlzip , dune_3 , dune-site-3 +, gcc9 , graphviz , lablgtk3 , lablgtk3-sourceview3 @@ -38,7 +39,7 @@ # We do not use buildDunePackage because Frama-C still uses a Makefile to build # some files and prepare some information before starting dune. -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "frama-c"; version = lib.strings.removeSuffix "\n" (builtins.readFile ../VERSION); slang = lib.strings.removeSuffix "\n" (builtins.readFile ../VERSION_CODENAME); @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { dune_3 dune-site-3 findlib + gcc9 graphviz lablgtk3 lablgtk3-sourceview3 diff --git a/nix/main-tests.nix b/nix/main-tests.nix index 69550b46835a018507e4060f5ea0a0e30faa4193..1c4c3d60e2fd39c63fc19bcf4f6222db901fa0a8 100644 --- a/nix/main-tests.nix +++ b/nix/main-tests.nix @@ -1,12 +1,12 @@ { lib -, stdenv +, stdenvNoCC # for E-ACSL , frama-c , perl , time , which }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "main-tests"; version = frama-c.version; slang = frama-c.slang; diff --git a/nix/plugins-tests.nix b/nix/plugins-tests.nix index a2e3d52d390d4aa3e35ff54a9298c4e8d4975c16..2efa68eca20af3637ccb488a97c96df3c87b8ae1 100644 --- a/nix/plugins-tests.nix +++ b/nix/plugins-tests.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , frama-c , alt-ergo , perl @@ -9,21 +9,21 @@ }: # TODO: SPLIT THIS -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "plugins-tests"; version = frama-c.version; slang = frama-c.slang; build_dir = frama-c.build_dir; src = build_dir + "/dir.tar"; - wp_cache = fetchGit "git@git.frama-c.com:frama-c/wp-cache.git"; # only for WP qualif + wp_cache = fetchGit "git@git.frama-c.com:frama-c/wp-cache.git"; # only for WP qualif / Aorai sourceRoot = "."; buildInputs = frama-c.buildInputs ++ [ - alt-ergo # only for WP qualif + alt-ergo # only for WP qualif / Aorai frama-c perl - pkgs.getopt + pkgs.getopt # only for E-ACSL time which ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { '' ; # Keep main configuration - # Only for WP qualif -> replace with true after split + # Only for WP qualif / Aorai -> replace with true after split configurePhase = '' mkdir home HOME=$(pwd)/home @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - export FRAMAC_WP_CACHEDIR=$wp_cache + export FRAMAC_WP_CACHEDIR=$wp_cache # only for WP qualif / Aorai dune exec -- frama-c-ptests src/plugins/*/tests dune build -j1 --display short @src/plugins/ptests '';