me/guix
Archived
1
0
Fork 0
Code Activity

gnu: windowmaker: Leave 'wmaker' unwrapped.

Browse source 
Fixes <http://bugs.gnu.org/18698>.
Reported by Mark H Weaver <mhw@netris.org>.

* gnu/packages/gnustep.scm (windowmaker)[arguments]: Add 'pre-configure'
  phase.  Change 'wrap' phase to wrap 'wmaker.inst', not 'wmaker'.
This commit is contained in:
Ludovic Courtès 2014-11-12 20:44:20 +01:00
parent 08dbc3b550
commit be05e643ae
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gnu/packages/gnustep.scm
View file

@ -40,17 +40,31 @@
"1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3")))) "1i3dw1yagsa3rs9x2na2ynqlgmbahayws0kz4vl00fla6550nns3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases (alist-cons-before
'install 'wrap 'configure 'pre-configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; 'wmaker' wants to invoke 'wmaker.inst' the first time,
;; and the 'wmsetbg', so make sure it uses the right ones.
;; We can't use a wrapper here because that would pollute
;; $PATH in the whole session.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
;; 'wmaker' wants to invoke 'wmaker.inst' the first time, (substitute* "src/main.c"
;; which in turn wants to invoke 'wmmenugen' etc., so (("\"wmaker\\.inst")
;; make sure everything is in $PATH. (string-append "\"" bin "/wmaker.inst")))
(wrap-program (string-append bin "/wmaker") (substitute* '("src/defaults.c" "WPrefs.app/Menu.c")
`("PATH" ":" prefix (,bin))))) (("\"wmsetbg")
%standard-phases))) (string-append "\"" bin "/wmsetbg")))))
(alist-cons-after
'install 'wrap
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
;; 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)))))
%standard-phases))))
(inputs (inputs
`(("libxmu" ,libxmu) `(("libxmu" ,libxmu)
("libxft" ,libxft) ("libxft" ,libxft)