diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-08-31 21:09:30 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-09-02 22:31:10 +0200 |
| commit | a751c59304e0f62a02c4fa87fbcbec888ed16853 (patch) | |
| tree | cee26538f05c98e173750901b9e6cc6406dbffe3 /gnu | |
| parent | edc5808afa26bb231cca9aa2b1d6588830df6300 (diff) | |
| download | guix-a751c59304e0f62a02c4fa87fbcbec888ed16853.tar.gz guix-a751c59304e0f62a02c4fa87fbcbec888ed16853.zip | |
gnu: wine64: Fix build.
With the core-updates merge, the handling of modify-phases makes the current
ordering a hard error. Make it so that phases are read from top to bottom.
* gnu/packages/wine.scm (wine64)[#:phases]: Move ‘copy-wine32-binaries’
and ‘copy-wine32-libraries’ before conditional ‘wrap-executable’.
<copy-wine32-manpage>: Use “.zst” instead of “.gz” as file ending.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/wine.scm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 35520ee03b..0e1195b6ed 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -256,6 +256,21 @@ integrate Windows applications into your desktop.") ) ((#:phases phases) #~(modify-phases #$phases + (add-after 'install 'copy-wine32-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + ;; Copy the 32-bit binaries needed for WoW64. + (copy-file (search-input-file inputs "/bin/wine") + (string-append out "/bin/wine")) + ;; Copy the real 32-bit wine-preloader instead of the wrapped + ;; version. + (copy-file (search-input-file inputs "/bin/.wine-preloader-real") + (string-append out "/bin/wine-preloader"))))) + (add-after 'install 'copy-wine32-libraries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + (copy-recursively (search-input-directory inputs "/lib/wine32") + (string-append out "/lib/wine32"))))) ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-loader ;; when installing to x86_64-linux so both are available. ;; TODO: Add more JSON files as they become available in Mesa. @@ -281,27 +296,12 @@ integrate Windows applications into your desktop.") `("VK_ICD_FILENAMES" ":" = ,icd-files))))))) (_ `())) - (add-after 'install 'copy-wine32-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out"))) - ;; Copy the 32-bit binaries needed for WoW64. - (copy-file (search-input-file inputs "/bin/wine") - (string-append out "/bin/wine")) - ;; Copy the real 32-bit wine-preloader instead of the wrapped - ;; version. - (copy-file (search-input-file inputs "/bin/.wine-preloader-real") - (string-append out "/bin/wine-preloader"))))) - (add-after 'install 'copy-wine32-libraries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - (copy-recursively (search-input-directory inputs "/lib/wine32") - (string-append out "/lib/wine32"))))) (add-after 'compress-documentation 'copy-wine32-manpage (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out"))) ;; Copy the missing man file for the wine binary from wine. - (copy-file (search-input-file inputs "/share/man/man1/wine.1.gz") - (string-append out "/share/man/man1/wine.1.gz"))))))) + (copy-file (search-input-file inputs "/share/man/man1/wine.1.zst") + (string-append out "/share/man/man1/wine.1.zst"))))))) ((#:configure-flags configure-flags '()) #~(cons "--enable-win64" #$configure-flags)))) (synopsis "Implementation of the Windows API (WoW64 version)") |