Fetch phobos

1 files changed, 57 insertions, 8 deletions

diff --git a/gn/packages/dlanguage.scm b/gn/packages/dlanguage.scm
index 85824e2..b06dc5a 100644
--- a/gn/packages/dlanguage.scm
+++ b/gn/packages/dlanguage.scm
@@ -16,7 +16,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages ldc)
+(define-module (gn packages dlanguage)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -26,16 +26,57 @@
   #:use-module (gnu packages llvm)
   #:use-module (guix git-download))
 
+(define-public ldc-phobos
+  (package
+    (name "ldc-phobos")
+    (version "0.16.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/ldc-developers/phobos/archive/ldc-v" version ".tar.gz"
+                    ))
+              (sha256
+               (base32
+                "0sgdj0536c4nb118yiw1f8lqy5d3g3lpg9l99l165lk9xy45l9z4"))))
+    (build-system cmake-build-system)
+    (supported-systems '("x86_64-linux" "i686-linux"))
+    (arguments `(#:tests? #f))
+    (inputs
+     `( ("libconfig" ,libconfig)
+       ("libedit" ,libedit)))
+    (native-inputs
+     `(("llvm" ,llvm)
+       ("clang" ,clang)))
+    ;; ("phobos" ,(origin
+    ;;              (method git-fetch)
+    ;;              (uri (get-reference
+    ;;                    (url "https://github.com/ldc-developers/phobos.git")
+    ;;                    (commit (string-append "ldc-v" version))))))
+    ;; (arguments
+    ;;  `(#:phases
+    ;;    'unpack
+    ;;    (lambda _ (system* "git submodules init --update"))))
+    (home-page "https://github.com/ldc-developers/ldc")
+    (synopsis "A compiler for the D programming language.")
+    (description
+     "LDC is a compiler for the D programming Language.  It is based on the
+latest DMD frontend and uses LLVM as backend.  LLVM provides a fast and modern
+backend for high quality code generation.  LDC is released under a BSD license
+with exceptions for the DMD frontend and code from GDC.  The development takes
+place mostly on x86-32 and x86-64 Linux and that is where LDC works best.")
+    (license license:bsd-3)))
+
 (define-public ldc
   (package
     (name "ldc")
     (version "0.16.1")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "https://roelj.com/ldc-" version ".tar.gz"))
-             (sha256
-              (base32
-               "1fciq3sfn9xs8fjpvfx6ba3x6zpa7vh1lxczl12mfpbgs7jhqhd9"))))
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/ldc-developers/ldc/archive/v" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jvilxx0rpqmkbja4m69fhd5g09697xq7vyqp2hz4hvxmmmv4j40"))))
               ;; (method git-fetch)
               ;; (uri (git-reference
               ;;       (url "git://github.com/ldc-developers/ldc.git")
@@ -49,11 +90,19 @@
     (supported-systems '("x86_64-linux" "i686-linux"))
     (arguments `(#:tests? #f))
     (inputs
-     `(("libconfig" ,libconfig)
+     `( ("libconfig" ,libconfig)
        ("libedit" ,libedit)))
     (native-inputs
      `(("llvm" ,llvm)
-       ("clang" ,clang)))
+       ("clang" ,clang)
+       ("openjdk6-src"
+        ,(origin
+          (method url-fetch)
+          (uri (string-append "https://github.com/ldc-developers/phobos/archive/ldc-v" version ".tar.gz"))
+          (sha256
+           (base32
+            "0sgdj0536c4nb118yiw1f8lqy5d3g3lpg9l99l165lk9xy45l9z4"))))
+      ))
     ;; ("phobos" ,(origin
     ;;              (method git-fetch)
     ;;              (uri (get-reference