diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
| commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
| tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/applications/science/logic/cvc4/default.nix | |
| parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
| parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/applications/science/logic/cvc4/default.nix')
| -rw-r--r-- | pkgs/applications/science/logic/cvc4/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 769f86d5d77a4..5175037f01b32 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -10,7 +10,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ gmp libantlr3c boost autoreconfHook ]; - preConfigure = "patchShebangs ./src/"; + preConfigure = '' + patchShebangs ./src/ + OLD_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS -P" + ''; + postConfigure = ''CPPFLAGS="$OLD_CPPFLAGS"''; doChecks = true; meta = with stdenv.lib; { |