From patchwork Mon Jan 30 20:35:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46540 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7E17027BBED; Mon, 30 Jan 2023 20:36:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8081527BBE9 for ; Mon, 30 Jan 2023 20:36:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMaso-0006zf-KS; Mon, 30 Jan 2023 15:36:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMask-0006vm-I0 for guix-patches@gnu.org; Mon, 30 Jan 2023 15:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMask-0001Lq-9o for guix-patches@gnu.org; Mon, 30 Jan 2023 15:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMask-000606-5Y for guix-patches@gnu.org; Mon, 30 Jan 2023 15:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH] gnu: wine: Invert the relationship between wine and wine-minimal. References: In-Reply-To: Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Jan 2023 20:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61067@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.167511095623054 (code B ref 61067); Mon, 30 Jan 2023 20:36:02 +0000 Received: (at 61067) by debbugs.gnu.org; 30 Jan 2023 20:35:56 +0000 Received: from localhost ([127.0.0.1]:50666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMasd-0005zl-AG for submit@debbugs.gnu.org; Mon, 30 Jan 2023 15:35:55 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:51269) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMasb-0005zV-DA for 61067@debbugs.gnu.org; Mon, 30 Jan 2023 15:35:54 -0500 Date: Mon, 30 Jan 2023 20:35:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675110946; x=1675370146; bh=9Sfb6aB7bvWvgjQGjTwhiDnsuWwD/XvhvCd8EYmJpM8=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=spEJz3sd74fygXewiC4sj2n2u76wwr5knrug2YOOLGEK1PJhSRui9Pkjl/4PrtTJP ol/qoZXh+TMyCl+FduNs3tucmhqGLaQkzMpbPqGY/vvHmOawg4sswOJXqCLjnIII+8 rPvXwZ//qBzVsjxXaFOHG3ICdGD0yTxXolvrYhPPY9jbB2BH8kiTIriXuLGi//qRut wJN1gv1P3JsF5gDQI6GH50h2R2G2oclcD6aNwIcQ9YFj9cFOSozk1RHRFZHuvhz7e0 bm6JBgkDCZg3MQLMeNuuOSPKV1t3TzkMxc40AG1TmrMPWAElZoHsEES6Zrf1PxgAIa rxFwrdpgxK7Dg== Message-ID: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wine.scm (wine,wine-minimal): Have wine expand upon the package definition of wine-minimal instead of having wine-minimal trim down the package definition of wine. --- gnu/packages/wine.scm | 162 +++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 81 deletions(-) base-commit: c2b40b4b4c9e0227e47730ebe73a653b89d1e568 prerequisite-patch-id: a4f31b7648d1a378604724327efd615cfaf30deb prerequisite-patch-id: 61c258aa83aa60b83e2b9e44ff0f88ecc4277ff0 prerequisite-patch-id: 151abf5b65589e5721ffc2607e884f5375150108 prerequisite-patch-id: c3046a4e9ad075f3013aafda88cec6a22341ac7c prerequisite-patch-id: 19a15bb5b766f40a985df7677db0866ad8c28069 -- 2.39.1 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 10cae76ed8..3299059968 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -74,9 +74,11 @@ (define-module (gnu packages wine) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -(define-public wine +;; This minimal build of Wine is needed to prevent a circular dependency with +;; vkd3d. +(define-public wine-minimal (package - (name "wine") + (name "wine-minimal") (version "8.0") (source (origin @@ -91,8 +93,77 @@ (define-public wine (sha256 (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) + (native-inputs (list bison flex)) + (inputs `()) + (arguments + (list + ;; Force a 32-bit build targeting a similar architecture, i.e.: + ;; armhf for armhf/aarch64, i686 for i686/x86_64. + #:system (match (%current-system) + ((or "armhf-linux" "aarch64-linux") "armhf-linux") + (_ "i686-linux")) + + ;; XXX: There's a test suite, but it's unclear whether it's supposed to + ;; pass. + #:tests? #f + + #:make-flags + #~(list "SHELL=bash" + (string-append "libdir=" #$output "/lib/wine32")) + + #: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))))))) + (add-after 'patch-generated-file-shebangs 'patch-makedep + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "tools/makedep.c" + (("output_filenames\\( unix_libs \\);" all) + (string-append all + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))) + #:configure-flags + #~(list "--without-freetype" + "--without-x"))) + (home-page "https://www.winehq.org/") + (synopsis "Implementation of the Windows API (32-bit only)") + (description + "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a +compatibility layer capable of running Windows applications. Instead of +simulating internal Windows logic like a virtual machine or emulator, Wine +translates Windows API calls into POSIX calls on-the-fly, eliminating the +performance and memory penalties of other methods and allowing you to cleanly +integrate Windows applications into your desktop.") + ;; Any platform should be able to build wine, but based on '#:system' these + ;; are the ones we currently support. + (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) + (license license:lgpl2.1+))) + +(define-public wine + (package + (inherit wine-minimal) + (name "wine") (native-inputs - (list bison flex gettext-minimal perl pkg-config)) + (modify-inputs (package-native-inputs wine-minimal) + (prepend gettext-minimal perl pkg-config))) (inputs ;; Some libraries like libjpeg are now compiled into native PE objects. ;; The ELF objects provided by Guix packages are of no use. Whilst this @@ -100,6 +171,7 @@ (define-public wine ;; to build some of these from Guix PACKAGE-SOURCE but attempts were not ;; fruitful so far. See . (list alsa-lib + bash-minimal cups dbus eudev @@ -132,23 +204,9 @@ (define-public wine vkd3d vulkan-loader)) (arguments - (list - ;; Force a 32-bit build targeting a similar architecture, i.e.: - ;; armhf for armhf/aarch64, i686 for i686/x86_64. - #:system (match (%current-system) - ((or "armhf-linux" "aarch64-linux") "armhf-linux") - (_ "i686-linux")) - - ;; XXX: There's a test suite, but it's unclear whether it's supposed to - ;; pass. - #:tests? #f - - #:make-flags - #~(list "SHELL=bash" - (string-append "libdir=" #$output "/lib/wine32")) - - #:phases - #~(modify-phases %standard-phases + (substitute-keyword-arguments (package-arguments wine-minimal) + ((#:phases phases) + #~(modify-phases #$phases ;; Explicitly set the 32-bit version of vulkan-loader when installing ;; to i686-linux or x86_64-linux. ;; TODO: Add more JSON files as they become available in Mesa. @@ -173,47 +231,8 @@ (define-public wine "/radeon_icd.i686.json" ":" icd "/intel_icd.i686.json"))))))))) (_ - `())) - (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))))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) - (add-before 'build 'set-widl-time-override - ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date in - ;; files generated by WIDL. - (lambda _ - (setenv "WIDL_TIME_OVERRIDE" "315532800")))))) - (home-page "https://www.winehq.org/") - (synopsis "Implementation of the Windows API (32-bit only)") - (description - "Wine (originally an acronym for \"Wine Is Not an Emulator\") is a -compatibility layer capable of running Windows applications. Instead of -simulating internal Windows logic like a virtual machine or emulator, Wine -translates Windows API calls into POSIX calls on-the-fly, eliminating the -performance and memory penalties of other methods and allowing you to cleanly -integrate Windows applications into your desktop.") - ;; Any platform should be able to build wine, but based on '#:system' these - ;; are thr ones we currently support. - (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux")) - (license license:lgpl2.1+))) + `())))) + ((#:configure-flags _ '()) #~'()))))) (define-public wine64 (package @@ -226,8 +245,7 @@ (define-public wine64 (strip-keyword-arguments '(#:system) (package-arguments wine)) ((#:make-flags _) #~(list "SHELL=bash" - (string-append "libdir=" #$output "/lib/wine64")) - ) + (string-append "libdir=" #$output "/lib/wine64"))) ((#:phases phases) #~(modify-phases #$phases ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-loader @@ -281,24 +299,6 @@ (define-public wine64 (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) -;; This minimal build of Wine is needed to prevent a circular dependency with -;; vkd3d. -(define-public wine-minimal - (package - (inherit wine) - (name "wine-minimal") - (native-inputs (modify-inputs (package-native-inputs wine) - (delete "gettext" "perl" "pkg-config"))) - (inputs `()) - (arguments - (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 (name "wine-staging-patchset-data")