unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Kaelyn Takata via Guix-patches via <guix-patches@gnu.org>
To: 61067@debbugs.gnu.org
Cc: Kaelyn Takata <kaelyn.alexi@protonmail.com>
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	[thread overview]
Message-ID: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> (raw)
In-Reply-To: <cover.1674781160.git.kaelyn.alexi@protonmail.com>

* 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






  parent reply	other threads:[~2023-01-27  1:09 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-26  0:17 [bug#61067] [PATCH 0/3] Update wine and wine-staging packages to 8.0 Kaelyn Takata via Guix-patches via
2023-01-26  0:23 ` [bug#61067] [PATCH 1/3] gnu: wine: Update " Kaelyn Takata via Guix-patches via
2023-01-26  0:24 ` [bug#61067] [PATCH 2/3] gnu: wine: Build more reproducibly Kaelyn Takata via Guix-patches via
2023-01-26 19:28   ` Liliana Marie Prikler
2023-01-26 20:46     ` Kaelyn via Guix-patches via
2023-01-26 21:09       ` Liliana Marie Prikler
2023-01-27  1:07         ` Kaelyn via Guix-patches via
2023-01-26  0:24 ` [bug#61067] [PATCH 3/3] gnu: wine-staging: Update to 8.0 Kaelyn Takata via Guix-patches via
2023-01-27  1:07 ` [bug#61067] [PATCH v2 0/5] Update wine and wine-staging packages " Kaelyn Takata via Guix-patches via
2023-01-27  1:08   ` [bug#61067] [PATCH v2 1/5] gnu: wine: Update " Kaelyn Takata via Guix-patches via
2023-01-27  1:08   ` [bug#61067] [PATCH v2 2/5] gnu: wine-staging: " Kaelyn Takata via Guix-patches via
2023-01-27  1:08   ` Kaelyn Takata via Guix-patches via [this message]
2023-01-27 18:03     ` [bug#61067] [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package Liliana Marie Prikler
2023-01-27 18:15       ` Kaelyn via Guix-patches via
2023-01-30 20:39       ` Kaelyn via Guix-patches via
2023-01-31 19:19         ` Liliana Marie Prikler
2023-01-27  1:08   ` [bug#61067] [PATCH v2 4/5] gnu: wine64: " Kaelyn Takata via Guix-patches via
2023-01-27  1:08   ` [bug#61067] [PATCH v2 5/5] gnu: wine: Build more reproducibly Kaelyn Takata via Guix-patches via
2023-01-30 20:35 ` [bug#61067] [PATCH] gnu: wine: Invert the relationship between wine and wine-minimal Kaelyn Takata via Guix-patches via
2023-02-02 21:23 ` [bug#61067] [PATCH v3 0/5] Update wine and wine-staging packages to 8.0 Kaelyn Takata via Guix-patches via
2023-02-02 21:23   ` [bug#61067] [PATCH v3 1/5] gnu: wine: Update " Kaelyn Takata via Guix-patches via
2023-02-02 21:23   ` [bug#61067] [PATCH v3 2/5] gnu: wine-staging: " Kaelyn Takata via Guix-patches via
2023-02-02 21:23   ` [bug#61067] [PATCH v3 3/5] gnu: wine-minimal: Make the parent of wine so phases can be shared Kaelyn Takata via Guix-patches via
2023-02-02 21:24   ` [bug#61067] [PATCH v3 4/5] gnu: wine64: Share phases with parent wine package Kaelyn Takata via Guix-patches via
2023-02-02 21:24   ` [bug#61067] [PATCH v3 5/5] gnu: wine-minimal: Build more reproducibly Kaelyn Takata via Guix-patches via
2023-02-05  6:13   ` bug#61067: [PATCH v3 0/5] Update wine and wine-staging packages to 8.0 Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com \
    --to=guix-patches@gnu.org \
    --cc=61067@debbugs.gnu.org \
    --cc=kaelyn.alexi@protonmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).