gn: openfbya: Clean up package.

* gn/packages/openfyba.scm (openfyba)[source]: Don't use unstable
tarball.
[arguments]: Use 'boostrap phase to replace 'boostrap phase. Adjust for
change in source.

1 files changed, 18 insertions, 21 deletions

diff --git a/gn/packages/openfyba.scm b/gn/packages/openfyba.scm
index bfc50b7..c1a1c90 100644
--- a/gn/packages/openfyba.scm
+++ b/gn/packages/openfyba.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com>
+;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,44 +19,40 @@
 
 (define-module (gn packages openfyba)
   #:use-module ((guix licenses))
-  #:use-module (gnu packages)
-  #:use-module (gnu packages autotools)
   #:use-module (guix packages)
-  #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages textutils)
-  #:use-module (gnu packages base)
-  ;;#:use-module (gnu packages tls)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages gnupg)
-  #:use-module (gnu packages bootstrap)
-  #:use-module (guix git-download))
+  #:use-module (gnu packages gnupg))
 
 (define-public openfyba
   (package
    (name "openfyba")
    (version "4.1.1")
    (source (origin
-             (method url-fetch)
-             (uri (string-append "https://github.com/kartverket/fyba/archive/"
-                                 version ".tar.gz"))
-             (file-name (string-append name "-" version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                    (url "https://github.com/kartverket/fyba.git")
+                    (commit version)))
+             (file-name (git-file-name name version))
              (sha256
               (base32
-               "0ya1agi78d386skq353dk400fl11q6whfqmv31qrkn4g5vamixlr"))))
+               "0zxw4pf3s7rb9g8209i3rj0v5jjw1vb79knd5mzvw9drpl9bbgpl"))))
     (inputs `(("zip" ,zip)
              ("autoconf" ,autoconf)
              ("automake" ,automake)
              ("libtool" ,libtool)
              ("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
-     (arguments
-     '(#:phases (modify-phases %standard-phases
-                    (add-after 'unpack `bootstrap
-                      (lambda _
-                        (zero? (system* "autoreconf" "-vfi")))))))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'bootstrap
+           (lambda _
+             (for-each make-file-writable (find-files "." ".*"))
+             (invoke "autoreconf" "-vfi"))))))
     (home-page "http://labs.kartverket.no/sos/")
     (synopsis "source code release of the FYBA library")
     (description "OpenFYBA is the source code release of the FYBA library.")
-    (license (list gpl2))))
+    (license gpl2)))