[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61067] [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent w
From: |
Kaelyn Takata |
Subject: |
[bug#61067] [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. |
Date: |
Fri, 27 Jan 2023 01:08:22 +0000 |
* gnu/packages/wine.scm (wine-minimal): Share phases with parent wine package.
---
gnu/packages/wine.scm | 31 +++++++------------------------
1 file changed, 7 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 6e43494c68..b9a8396b75 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -308,30 +308,13 @@ (define-public wine-minimal
(delete "gettext" "perl" "pkg-config")))
(inputs `())
(arguments
- `(#:validate-runpath? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-SHELL
- (lambda _
- (substitute* "configure"
- ;; configure first respects CONFIG_SHELL, clobbers SHELL later.
- (("/bin/sh")
- (which "bash")))))
- (add-after 'configure 'patch-dlopen-paths
- ;; Hardcode dlopened sonames to absolute paths.
- (lambda _
- (let* ((library-path (search-path-as-string->list
- (getenv "LIBRARY_PATH")))
- (find-so (lambda (soname)
- (search-path library-path soname))))
- (substitute* "include/config.h"
- (("(#define SONAME_.* )\"(.*)\"" _ defso soname)
- (format #f "~a\"~a\"" defso (find-so soname))))))))
- #:configure-flags
- (list "--without-freetype"
- "--without-x")
- ,@(strip-keyword-arguments '(#:configure-flags #:phases)
- (package-arguments wine))))))
+ (substitute-keyword-arguments (package-arguments wine)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'wrap-executable))) ;; Don't reference Vulkan ICD files.
+ ((#:configure-flags _ '())
+ #~(list "--without-freetype"
+ "--without-x"))))))
(define-public wine-staging-patchset-data
(package
--
2.39.1
- [bug#61067] [PATCH 2/3] gnu: wine: Build more reproducibly., (continued)
[bug#61067] [PATCH 1/3] gnu: wine: Update to 8.0., Kaelyn Takata, 2023/01/25
[bug#61067] [PATCH 3/3] gnu: wine-staging: Update to 8.0., Kaelyn Takata, 2023/01/25
[bug#61067] [PATCH v2 0/5] Update wine and wine-staging packages to 8.0, Kaelyn Takata, 2023/01/26
[bug#61067] [PATCH v2 4/5] gnu: wine64: Share phases with parent wine package., Kaelyn Takata, 2023/01/26
[bug#61067] [PATCH] gnu: wine: Invert the relationship between wine and wine-minimal., Kaelyn Takata, 2023/01/30