aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-02-16 09:30:40 +0200
committerEfraim Flashner <efraim@flashner.co.il>2016-02-16 09:30:40 +0200
commitd694230abe42ac2c537b216402f60ff384c743bf (patch)
tree5335e8655da6ae3bd77a2a2a326e340be576ad8a
parentd8a4b93253efd6a45990d399734e40b948166358 (diff)
downloadpatches-d694230abe42ac2c537b216402f60ff384c743bf.tar
patches-d694230abe42ac2c537b216402f60ff384c743bf.tar.gz
gnu: librecad: Use 'modify-phases'.
* gnu/packages/engineering.scm (librecad)[arguments]: Use 'modify-phases'.
-rw-r--r--gnu/packages/engineering.scm38
1 files changed, 17 insertions, 21 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f7042f1289..204ea9dc02 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -69,29 +69,25 @@
(build-system gnu-build-system)
(arguments
'(#:phases
- (alist-cons-after
- 'unpack
- 'patch-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* "librecad/src/lib/engine/rs_system.cpp"
- (("/usr/share") (string-append out "/share")))))
- (alist-replace
- 'configure
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "librecad/src/lib/engine/rs_system.cpp"
+ (("/usr/share") (string-append out "/share"))))))
+ (replace 'configure
(lambda* (#:key inputs #:allow-other-keys)
(system* "qmake" (string-append "BOOST_DIR="
- (assoc-ref inputs "boost"))))
- (alist-replace
- 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (mkdir-p (string-append out "/bin"))
- (mkdir-p (string-append out "/share/librecad"))
- (copy-file "unix/librecad"
- (string-append out "/bin/librecad"))
- (copy-recursively "unix/resources"
- (string-append out "/share/librecad"))))
- %standard-phases)))))
+ (assoc-ref inputs "boost")))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (mkdir-p (string-append out "/bin"))
+ (mkdir-p (string-append out "/share/librecad"))
+ (copy-file "unix/librecad"
+ (string-append out "/bin/librecad"))
+ (copy-recursively "unix/resources"
+ (string-append out "/share/librecad"))))))))
(inputs
`(("boost" ,boost)
("muparser" ,muparser)