ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: windowmaker: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/gnustep.scm
(windowmaker): Remove trailing #t.
[inputs]: Add 'bash-minimal'.  Remove labels.  Sort.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Icba4437e459e209cb5af4e00a436d3921fc27957
This commit is contained in:
Maxime Devos 2021-07-02 12:13:00 +02:00 committed by Ludovic Courtès
parent 7fb5b4cf0d
commit 3631e865fa
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/gnustep.scm
View file

@ -30,6 +30,7 @@ (define-module (gnu packages gnustep)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages xorg)
#:use-module (gnu packages libffcall)
@ -152,8 +153,7 @@ (define-public windowmaker
;; The path to wmsetbg in Guix requires 67 extra characters.
(substitute* "src/defaults.c"
(("len = strlen\\(text\\) \\+ 40;")
(string-append "len = strlen(text) + 107;")))
#t)))
(string-append "len = strlen(text) + 107;"))))))
(add-after 'install 'install-xsession
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@ -171,8 +171,7 @@ (define-public windowmaker
(string-map (match-lambda
(#\newline #\space)
(chr chr))
,synopsis) out))))
#t))
,synopsis) out))))))
(add-after 'install-xsession 'wrap
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@ -180,18 +179,18 @@ (define-public windowmaker
;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
;; etc., so make sure everything is in $PATH.
(wrap-program (string-append bin "/wmaker.inst")
`("PATH" ":" prefix (,bin)))
#t))))))
`("PATH" ":" prefix (,bin)))))))))
(inputs
`(("libxmu" ,libxmu)
("libxft" ,libxft)
("libx11" ,libx11)
("libxinerama" ,libxinerama)
("fontconfig" ,fontconfig)
("libjpeg" ,libjpeg-turbo)
("giflib" ,giflib)
("libpng" ,libpng)
("libtiff" ,libtiff)))
(list bash-minimal ;for wrap-program
fontconfig
giflib
libjpeg-turbo
libpng
libtiff
libx11
libxft
libxinerama
libxmu))
(native-inputs
(list pkg-config))
(home-page "https://windowmaker.org/")