me
/
guix
Archived
1
0
Fork 0
Code

gnu: wine64-staging: Fix arguments. 

* gnu/packages/wine.scm (wine64-staging)[arguments]: Use new
'copy-wine32-binaries and 'copy-wine32-manpage phases instead of
'copy-wine32-files phase.
master
Rutger Helling 2018-01-03 10:38:07 +01:00
parent 036f35772c
commit e6b94a0247
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gnu/packages/wine.scm
View File

@ -269,23 +269,25 @@ integrated into the main branch.")
(string-append "libdir=" %output "/lib/wine64")) (string-append "libdir=" %output "/lib/wine64"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'copy-wine32-files (add-after 'install 'copy-wine32-binaries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Copy the 32-bit binaries needed for WoW64. (let* ((wine32 (assoc-ref %build-inputs "wine"))
(copy-file (string-append (assoc-ref %build-inputs "wine-staging") (out (assoc-ref %outputs "out")))
"/bin/wine") (string-append (assoc-ref ;; Copy the 32-bit binaries needed for WoW64.
%outputs "out") "/bin/wine")) (copy-file (string-append wine32 "/bin/wine")
(copy-file (string-append (assoc-ref %build-inputs "wine-staging") (string-append out "/bin/wine"))
"/bin/wine-preloader") (string-append (copy-file (string-append wine32 "/bin/wine-preloader")
(assoc-ref %outputs "out") (string-append out "/bin/wine-preloader"))
"/bin/wine-preloader")) #t)))
;; Copy the missing man file for the wine binary from wine-staging. (add-after 'compress-documentation 'copy-wine32-manpage
(system (string-append "gunzip < " (string-append (assoc-ref (lambda* (#:key outputs #:allow-other-keys)
%build-inputs "wine-staging") (let* ((wine32 (assoc-ref %build-inputs "wine"))
"/share/man/man1/wine.1.gz") "> " (out (assoc-ref %outputs "out")))
(string-append (assoc-ref %outputs "out") ;; Copy the missing man file for the wine binary from
"/share/man/man1/wine.1"))) ;; wine-staging.
#t)) (copy-file (string-append wine32 "/share/man/man1/wine.1.gz")
(string-append out "/share/man/man1/wine.1.gz"))
#t)))
(add-after 'configure 'patch-dlopen-paths (add-after 'configure 'patch-dlopen-paths
;; Hardcode dlopened sonames to absolute paths. ;; Hardcode dlopened sonames to absolute paths.
(lambda _ (lambda _