diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2016-09-13 12:30:41 +0200 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-09-13 15:24:55 -0400 |
| commit | 812b3c1f8a3717fd9fc540663912c5e9a144db5b (patch) | |
| tree | 94cd98e5d80a0b66e5f03a0b49e6cd0ce1728634 | |
| parent | f26dd9b2cc6ef2c3856fe991a04adf17d7361475 (diff) | |
| download | gnu-guix-812b3c1f8a3717fd9fc540663912c5e9a144db5b.tar gnu-guix-812b3c1f8a3717fd9fc540663912c5e9a144db5b.tar.gz | |
gnu: ldc: Fix build failure.
* gnu/packages/ldc.scm (ldc)[arguments]: Add 'patch-dmd2' phase.
[inputs]: Add zlib.
[native-inputs]: Specify version 3.7 of LLVM and Clang.
Signed-off-by: Leo Famulari <leo@famulari.name>
| -rw-r--r-- | gnu/packages/ldc.scm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 1709f59f4c..560fa497fb 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -26,6 +26,7 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages compression) #:use-module (gnu packages libedit) #:use-module (gnu packages llvm) #:use-module (gnu packages textutils) @@ -101,6 +102,14 @@ and freshness without requiring additional information from the user.") (and (unpack "phobos-src" "runtime/phobos") (unpack "druntime-src" "runtime/druntime") (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) + (add-after 'unpack-submodule-sources 'patch-dmd2 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "dmd2/root/port.c" + ((" ::isnan") " isnan") + ((" ::isinf") " isinf") + (("#undef isnan") "") + (("#undef isinf") "")) + #t)) (add-after 'unpack-submodule-sources 'patch-phobos (lambda* (#:key inputs #:allow-other-keys) (substitute* "runtime/phobos/std/process.d" @@ -115,10 +124,11 @@ and freshness without requiring additional information from the user.") (inputs `(("libconfig" ,libconfig) ("libedit" ,libedit) - ("tzdata" ,tzdata))) + ("tzdata" ,tzdata) + ("zlib" ,zlib))) (native-inputs - `(("llvm" ,llvm) - ("clang" ,clang) + `(("llvm" ,llvm-3.7) + ("clang" ,clang-3.7) ("unzip" ,unzip) ("phobos-src" ,(origin |