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

gnu: gnustep: Update phase style. 

* gnu/packages/gnustep.scm (windowmaker)[arguments]: Don't use %OUTPUT.
End phases with #t.
(wmbattery, wmclock)[arguments]: Substitute INVOKE for SYSTEM*.  End
phases with #t.
This commit is contained in:
Tobias Geerinckx-Rice 2018-02-15 23:28:51 +01:00
parent 9a0a4a95f0
commit bfe83d568c
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/gnustep.scm
View File

@ -102,7 +102,8 @@ to easily create cross-compiled binaries.")
;; The path to wmsetbg in Guix requires 67 extra characters. ;; The path to wmsetbg in Guix requires 67 extra characters.
(substitute* "src/defaults.c" (substitute* "src/defaults.c"
(("len = strlen\\(text\\) \\+ 40;") (("len = strlen\\(text\\) \\+ 40;")
(string-append "len = strlen(text) + 107;")))))) (string-append "len = strlen(text) + 107;")))
#t)))
(add-after 'install 'install-xsession (add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -120,7 +121,7 @@ to easily create cross-compiled binaries.")
(string-map (match-lambda (string-map (match-lambda
(#\newline #\space) (#\newline #\space)
(chr chr)) (chr chr))
,synopsis) %output)))) ,synopsis) out))))
#t)) #t))
(add-after 'install-xsession 'wrap (add-after 'install-xsession 'wrap
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -129,7 +130,8 @@ to easily create cross-compiled binaries.")
;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen' ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
;; etc., so make sure everything is in $PATH. ;; etc., so make sure everything is in $PATH.
(wrap-program (string-append bin "/wmaker.inst") (wrap-program (string-append bin "/wmaker.inst")
`("PATH" ":" prefix (,bin))))))))) `("PATH" ":" prefix (,bin)))
#t))))))
(inputs (inputs
`(("libxmu" ,libxmu) `(("libxmu" ,libxmu)
("libxft" ,libxft) ("libxft" ,libxft)
@ -170,7 +172,9 @@ interface. It is fast, feature rich, easy to configure, and easy to use.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'autoconf (add-after 'unpack 'autoconf
(lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (lambda _
(invoke "autoreconf" "-vfi")
#t)))))
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
("libx11" ,libx11) ("libx11" ,libx11)
@ -262,7 +266,9 @@ on.")
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'autoconf (add-after 'unpack 'autoconf
(lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (lambda _
(invoke "autoreconf" "-vfi")
#t)))))
;; wmclock requires autoreconf to generate its configure script. ;; wmclock requires autoreconf to generate its configure script.
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)