diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-01-10 14:30:36 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-01-10 14:30:36 +0200 |
| commit | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (patch) | |
| tree | 4df49b9f438e0e466efb3d589027a62b39d49761 /gnu/packages/cpp.scm | |
| parent | 87eaa4207208e16e5e1b22b60ba4ff5c3d035023 (diff) | |
| parent | d0fff8f840afc17be40bdc49bff52ed08d5a1a7b (diff) | |
| download | guix-patches-6985a1acb3e9cc4cad8b6f63d77154842d25c929.tar guix-patches-6985a1acb3e9cc4cad8b6f63d77154842d25c929.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/cpp.scm')
| -rw-r--r-- | gnu/packages/cpp.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 00e006928e..45d3faeafb 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -334,7 +334,8 @@ as ordering relation.") (build-system cmake-build-system) (arguments '(#:configure-flags - (list (string-append "-DJSON_TestDataDirectory=" + (list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp. + (string-append "-DJSON_TestDataDirectory=" (assoc-ref %build-inputs "json_test_data"))) #:phases (modify-phases %standard-phases ;; XXX: When tests are enabled, the install phase will cause |