;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016, 2017, 2019 Eric Bavier <bavier@posteo.net>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages lego)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
(define-public leocad
(package
(name "leocad")
- (version "17.07")
+ (version "19.07.1")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/leozide/leocad/"
- "archive/v" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/leozide/leocad.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "02gm4950zlmsw4sxmdwypgkybn51b02qnmmk6rzjdr8si4k6gikq"))))
+ "02kv1m18g6s4dady9jv4sjivfkrp192bmdw2a3d9lzlp60zks0p2"))))
(build-system gnu-build-system)
(native-inputs
- `(("qttools" ,qttools))) ;for lrelease
+ `(("qttools" ,qttools))) ; for lrelease
(inputs
`(("mesa" ,mesa)
("qtbase" ,qtbase)
(replace 'configure
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- (zero? (system* "qmake"
- (string-append "INSTALL_PREFIX=" out)
- ;; Otherwise looks for lrelease-qt4
- "QMAKE_LRELEASE=lrelease"
- ;; Don't pester users about updates
- "DISABLE_UPDATE_CHECK=1")))))
+ (invoke "qmake"
+ (string-append "INSTALL_PREFIX=" out)
+ ;; Otherwise looks for lrelease-qt4.
+ "QMAKE_LRELEASE=lrelease"
+ ;; Don't pester users about updates.
+ "DISABLE_UPDATE_CHECK=1")
+ #t)))
(add-after 'configure 'reset-resource-timestamps
(lambda _
;; The contents of build/release/.qrc/qrc_leocad.cpp generated by
(src (string-append base ".ts"))
(st (stat src)))
(set-file-time file st)))
- (find-files "." "leocad_.*\\.qm"))))))))
- (home-page "http://www.leocad.org")
+ (find-files "." "leocad_.*\\.qm")))
+ #t)))))
+ (home-page "https://www.leocad.org")
(synopsis "Create virtual Lego models")
(description
"LeoCAD is a program for creating virtual LEGO models. It has an