[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: gnu: fritzing: Improve package style.
From: |
guix-commits |
Subject: |
06/08: gnu: fritzing: Improve package style. |
Date: |
Thu, 10 Aug 2023 18:54:34 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 11d0006b2ade59ca29398a7a87d62a983c6d7276
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Tue Apr 18 21:19:59 2023 +0100
gnu: fritzing: Improve package style.
* gnu/package/engineering.scm (fritzing): Improve package style.
Use Gexp.
[inputs]: Remove labels. Sort alphabetically.
[native-inputs]: Introduce it, use fritzing-parts instead local source.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/engineering.scm | 95 +++++++++++++++++++++-----------------------
1 file changed, 46 insertions(+), 49 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index b1084d541c..4483ab81e8 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -713,58 +713,55 @@ multipole-accelerated algorithm.")
(package
(name "fritzing")
(version "0.9.6")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fritzing/fritzing-app")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fritzing/fritzing-app")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (copy-recursively (assoc-ref inputs "fritzing-parts-db")
- "parts")
- ;; Use system libgit2 and boost.
- (substitute* "phoenix.pro"
- (("^LIBGIT_STATIC.*")
- (string-append "LIBGIT2INCLUDE=" (assoc-ref inputs "libgit2")
"/include\n"
- "LIBGIT2LIB=" (assoc-ref inputs "libgit2")
"/lib\n"
- "INCLUDEPATH += $$LIBGIT2INCLUDE\n"
- "LIBS += -L$$LIBGIT2LIB -lgit2\n"))
- (("^.*pri/libgit2detect.pri.") ""))
- ;; Trick the internal mechanism to load the parts
- (substitute* "src/version/partschecker.cpp"
- ((".*git_libgit2_init.*")
- "return
\"083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs\";"))
-
- (let ((out (assoc-ref outputs "out")))
- (invoke "qmake"
- (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out
"/lib")
- (string-append "PREFIX=" out)
- "phoenix.pro")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ ;; Integrate parts library
+ (copy-recursively
+ (string-append #$(this-package-native-input "fritzing-parts")
+ "/share/library")
+ "parts")
+ ;; Use system libgit2 and boost.
+ (substitute* "phoenix.pro"
+ (("^LIBGIT_STATIC.*")
+ (string-append
+ "LIBGIT2INCLUDE=" #$(this-package-input "libgit2")
"/include\n"
+ "LIBGIT2LIB=" #$(this-package-input "libgit2") "/lib\n"
+ "INCLUDEPATH += $$LIBGIT2INCLUDE\n"
+ "LIBS += -L$$LIBGIT2LIB -lgit2\n"))
+ (("^.*pri/libgit2detect.pri.") ""))
+ ;; Trick the internal mechanism to load the parts
+ (substitute* "src/version/partschecker.cpp"
+ ((".*git_libgit2_init.*")
+ "return
\"083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs\";"))
+ (invoke "qmake"
+ (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," #$output
"/lib")
+ (string-append "PREFIX=" #$output)
+ "phoenix.pro"))))))
+ (native-inputs
+ (list fritzing-parts))
(inputs
- `(("qtbase" ,qtbase-5)
- ("qtserialport" ,qtserialport)
- ("qtsvg-5" ,qtsvg-5)
- ("libgit2" ,libgit2)
- ("boost" ,boost)
- ("zlib" ,zlib)
- ("fritzing-parts-db"
- ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fritzing/fritzing-parts")
- (commit (string-append "release_" version))))
- (file-name (git-file-name "fritzing-parts" version))
- (sha256
- (base32
- "0wsvn57v6n0ygnhk2my94rrfzb962z1cj4d1xmp1farwck3811h6"))))))
+ (list boost
+ libgit2
+ qtbase-5
+ ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is
+ ;; packed.
+ qtserialport
+ qtsvg-5
+ zlib))
(home-page "https://fritzing.org")
(synopsis "Electronic circuit design")
(description
- branch master updated (3775006f24 -> 56fddefc6d), guix-commits, 2023/08/10
- 01/08: gnu: libflame: Remove dependency on OpenBLAS., guix-commits, 2023/08/10
- 03/08: gnu: openfoam-org: Use 'git-fetch'., guix-commits, 2023/08/10
- 05/08: gnu: Add fritzing-parts., guix-commits, 2023/08/10
- 02/08: gnu: libflame: Remove input labels and use gexps., guix-commits, 2023/08/10
- 04/08: services: postgresql: Add more role fields., guix-commits, 2023/08/10
- 06/08: gnu: fritzing: Improve package style.,
guix-commits <=
- 07/08: gnu: Sort use-module alphabetically in (gnu packages engineering), guix-commits, 2023/08/10
- 08/08: services: syncthing: Use the new command line syntax., guix-commits, 2023/08/10