nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: cl-stumpwm: Build the library in "lib" and the program in "bin". 

* 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.
master
Andy Patterson 2017-04-03 09:01:22 -04:00 committed by Ricardo Wurmus
parent 6c76ce39ac
commit 290bf612bb
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/lisp.scm
View File

@ -853,7 +853,7 @@ from other CLXes around the net.")
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(inputs `(("sbcl-cl-ppcre" ,sbcl-cl-ppcre) (inputs `(("sbcl-cl-ppcre" ,sbcl-cl-ppcre)
("sbcl-clx" ,sbcl-clx))) ("sbcl-clx" ,sbcl-clx)))
(outputs '("out" "bin")) (outputs '("out" "lib"))
(arguments (arguments
'(#:special-dependencies '("sb-posix") '(#:special-dependencies '("sb-posix")
#:phases #:phases
@ -862,20 +862,18 @@ from other CLXes around the net.")
(lambda* (#:key lisp outputs inputs #:allow-other-keys) (lambda* (#:key lisp outputs inputs #:allow-other-keys)
(build-program (build-program
lisp lisp
(string-append (assoc-ref outputs "bin") "/bin/stumpwm") (string-append (assoc-ref outputs "out") "/bin/stumpwm")
#:inputs inputs #:inputs inputs
#:entry-program '((stumpwm:stumpwm) 0)))) #:entry-program '((stumpwm:stumpwm) 0))))
(add-after 'build-program 'create-desktop-file (add-after 'build-program 'create-desktop-file
(lambda* (#:key outputs lisp binary? #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((output (or (assoc-ref outputs "bin") (let* ((out (assoc-ref outputs "out"))
(assoc-ref outputs "out"))) (xsessions (string-append out "/share/xsessions")))
(xsessions "/share/xsessions")) (mkdir-p xsessions)
(mkdir-p (string-append output xsessions)) (call-with-output-file
(with-output-to-file (string-append xsessions "/stumpwm.desktop")
(string-append output xsessions (lambda (file)
"/stumpwm.desktop") (format file
(lambda _
(format #t
"[Desktop Entry]~@ "[Desktop Entry]~@
Name=stumpwm~@ Name=stumpwm~@
Comment=The Stump Window Manager~@ Comment=The Stump Window Manager~@
@ -883,7 +881,7 @@ from other CLXes around the net.")
TryExec=~@*~a/bin/stumpwm~@ TryExec=~@*~a/bin/stumpwm~@
Icon=~@ Icon=~@
Type=Application~%" Type=Application~%"
output))) out)))
#t)))))) #t))))))
(synopsis "Window manager written in Common Lisp") (synopsis "Window manager written in Common Lisp")
(description "Stumpwm is a window manager written entirely in Common Lisp. (description "Stumpwm is a window manager written entirely in Common Lisp.
@ -1143,7 +1141,7 @@ multiple inspectors with independent history.")
(name "sbcl-stumpwm-with-slynk") (name "sbcl-stumpwm-with-slynk")
(outputs '("out")) (outputs '("out"))
(native-inputs (native-inputs
`(("stumpwm" ,sbcl-stumpwm) `(("stumpwm" ,sbcl-stumpwm "lib")
("slynk" ,sbcl-slynk))) ("slynk" ,sbcl-slynk)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sbcl-stumpwm) (substitute-keyword-arguments (package-arguments sbcl-stumpwm)
@ -1164,6 +1162,6 @@ multiple inspectors with independent history.")
(delete 'copy-source) (delete 'copy-source)
(delete 'build) (delete 'build)
(delete 'check) (delete 'check)
(delete 'link-dependencies) (delete 'create-asd-file)
(delete 'cleanup) (delete 'cleanup)
(delete 'create-symlinks))))))) (delete 'create-symlinks)))))))