ldc: share main ldc definition

1 files changed, 5 insertions, 46 deletions

diff --git a/gn/packages/ldc.scm b/gn/packages/ldc.scm
index d465a43..90fb7da 100644
--- a/gn/packages/ldc.scm
+++ b/gn/packages/ldc.scm
@@ -27,56 +27,15 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
+  #:use-module ((gnu packages ldc) #:prefix ldcmain:)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages zip))
 
-(define-public rdmd
-  (let ((commit "da0a2e0a379b08294015eec9d531f1e5dd4226f0"))
-    (package
-      (name "rdmd")
-      (version (string-append "v2.070.0-1." (string-take commit 7)))
-      (source (origin
-        (method git-fetch)
-        (uri (git-reference
-              (url "https://github.com/D-Programming-Language/tools.git")
-              (commit commit)))
-        (file-name (string-append name "-" version "-checkout"))
-        (sha256
-         (base32
-          "1pcx5lyqzrip86f4vv60x292rpvnwsq2hvl1znm9x9rn68f34m45"))))
-      (build-system gnu-build-system)
-      (arguments
-       '(#:phases
-         (modify-phases %standard-phases
-           (delete 'configure)
-           (delete 'check) ; There is no Makefile, so there's no 'make check'.
-           (replace
-            'build
-            (lambda _
-              (zero? (system* "ldc2" "rdmd.d"))))
-           (replace
-            'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
-                (install-file "rdmd" bin)))))))
-      (native-inputs
-       `(("ldc" ,ldc)))
-      (home-page "https://github.com/D-Programming-Language/tools/")
-      (synopsis "Specialized equivalent to 'make' for the D language")
-      (description
-       "rdmd is a companion to the dmd compiler that simplifies the typical
-edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle.  Like
-make and other tools, rdmd uses the relative dates of the files involved to
-minimize the amount of work necessary.  Unlike make, rdmd tracks dependencies
-and freshness without requiring additional information from the user.")
-      (license license:boost1.0))))
-
-
 (define-public ldc-0.17.2
   (package
-    (inherit ldc)
+    (inherit ldcmain:ldc)
     (name "ldc")
     (version "0.17.2")
     (source (origin
@@ -122,8 +81,8 @@ and freshness without requiring additional information from the user.")
              #t)))
        #:tests? #f))
     (native-inputs
-     `(("llvm" ,llvm-3.7.1)
-       ("clang" ,clang-3.7.1)
+     `(("llvm" ,llvm-3.7)
+       ("clang" ,clang-3.7)
        ("unzip" ,unzip)
        ("phobos-src"
         ,(origin
@@ -155,7 +114,7 @@ and freshness without requiring additional information from the user.")
 
 (define-public ldc-1.1.0-beta4
   (package
-    (inherit ldc)
+    (inherit ldcmain:ldc)
     (name "ldc")
     (version "1.1.0-beta4")
     (source (origin