diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-14 01:42:02 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-14 01:42:02 +0100 |
commit | bb4674b43fa413a6d41694b2093c3b00d11eea47 (patch) | |
tree | e9de75e813e90459c5313ba73ac22473b0e0e565 /gnu/packages/admin.scm | |
parent | 41c6e4f2b40f41cdbf4e8c7ade29845709f9cdf4 (diff) | |
parent | 989d564f4434c6e43df7ccb0d1701e89e243e404 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/admin.scm')
-rw-r--r-- | gnu/packages/admin.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0f27e6370b..5ec34864e2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3170,7 +3170,16 @@ late.") version "/launchmon-v" version ".tar.gz")) (sha256 (base32 - "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x")))) + "0fm3nd9mydm9v2bf7bh01dbgrfnpwkapxa3dsvy3x1z0rz61qc0x")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix build failure with GCC 7 due to a conversion error. + ;; Remove for versions > 1.0.2. + (substitute* "launchmon/src/linux/lmon_api/lmon_coloc_spawner.cxx" + ((" lmonpl = '\\\\0'") + " *lmonpl = '\\0'")) + #t)))) (build-system gnu-build-system) (inputs `(("mpi" ,openmpi) |