[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26346: [PATCH 05/17] gnu: cl-stumpwm: Build the library in "lib" and
From: |
Andy Patterson |
Subject: |
bug#26346: [PATCH 05/17] gnu: cl-stumpwm: Build the library in "lib" and the program in "bin". |
Date: |
Mon, 3 Apr 2017 09:01:22 -0400 |
* gnu/packages/lisp.scm (sbcl-stumpwm)[outputs]: Remove "bin" and add "lib".
[arguments]<#:phases>: Change the target of `build-program' to the "out"
output. Likewise, change the target of the desktop file generation.
(sbcl-stumpwm+slynk)[inputs]: Use the "lib" output of sbcl-stumpwm.
---
gnu/packages/lisp.scm | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index e27cc7b11..5502de86a 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -851,7 +851,7 @@ from other CLXes around the net.")
(build-system asdf-build-system/sbcl)
(inputs `(("sbcl-cl-ppcre" ,sbcl-cl-ppcre)
("sbcl-clx" ,sbcl-clx)))
- (outputs '("out" "bin"))
+ (outputs '("out" "lib"))
(arguments
'(#:special-dependencies '("sb-posix")
#:phases
@@ -860,20 +860,18 @@ from other CLXes around the net.")
(lambda* (#:key lisp outputs inputs #:allow-other-keys)
(build-program
lisp
- (string-append (assoc-ref outputs "bin") "/bin/stumpwm")
+ (string-append (assoc-ref outputs "out") "/bin/stumpwm")
#:inputs inputs
#:entry-program '((stumpwm:stumpwm) 0))))
(add-after 'build-program 'create-desktop-file
- (lambda* (#:key outputs lisp binary? #:allow-other-keys)
- (let ((output (or (assoc-ref outputs "bin")
- (assoc-ref outputs "out")))
- (xsessions "/share/xsessions"))
- (mkdir-p (string-append output xsessions))
- (with-output-to-file
- (string-append output xsessions
- "/stumpwm.desktop")
- (lambda _
- (format #t
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (xsessions (string-append out "/share/xsessions")))
+ (mkdir-p xsessions)
+ (call-with-output-file
+ (string-append xsessions "/stumpwm.desktop")
+ (lambda (file)
+ (format file
"[Desktop Entry]~@
Name=stumpwm~@
Comment=The Stump Window Manager~@
@@ -881,7 +879,7 @@ from other CLXes around the net.")
address@hidden/bin/stumpwm~@
Icon=~@
Type=Application~%"
- output)))
+ out)))
#t))))))
(synopsis "Window manager written in Common Lisp")
(description "Stumpwm is a window manager written entirely in Common Lisp.
@@ -1141,7 +1139,7 @@ multiple inspectors with independent history.")
(name "sbcl-stumpwm-with-slynk")
(outputs '("out"))
(native-inputs
- `(("stumpwm" ,sbcl-stumpwm)
+ `(("stumpwm" ,sbcl-stumpwm "lib")
("slynk" ,sbcl-slynk)))
(arguments
(substitute-keyword-arguments (package-arguments sbcl-stumpwm)
@@ -1162,6 +1160,6 @@ multiple inspectors with independent history.")
(delete 'copy-source)
(delete 'build)
(delete 'check)
- (delete 'link-dependencies)
+ (delete 'create-asd-file)
(delete 'cleanup)
(delete 'create-symlinks)))))))
--
2.11.1
- bug#26346: [PATCH 17/17] gnu: sbcl-slynk-boot0: Give the package an appropriate name., (continued)
- bug#26346: [PATCH 17/17] gnu: sbcl-slynk-boot0: Give the package an appropriate name., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 03/17] build-system/asdf: Rename %install-prefix to %source-install-prefix., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 08/17] build-system/asdf: Keep ecl's generated archive files., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 15/17] build-system/asdf: Simplify the use of lisp-eval-program., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 16/17] build-system/asdf: Retain references to source files for binary outputs., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 11/17] build-system/asdf: Pass the system name as an argument to the builder., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 10/17] build-system/asdf: Parameterize the lisp type and implementation globally., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 12/17] build-system/asdf: Always pre-load the system's definition file., Andy Patterson, 2017/04/03
- bug#26346: [PATCH 05/17] gnu: cl-stumpwm: Build the library in "lib" and the program in "bin".,
Andy Patterson <=
- bug#26346: [PATCH 18/20] build-system/asdf: Handle tests defined in external systems., Andy Patterson, 2017/04/08
- bug#26346: [PATCH] asdf-build-system improvements., Andy Patterson, 2017/04/08