From 3139f18524334c4ba373f5f031dbab7f44c94650 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 12 Mar 2018 10:41:51 +0100 Subject: gnu: wine64-staging: Update to 3.3. * gnu/packages/wine.scm (wine64-staging): Update to 3.3. [arguments]: Remove 'hardcode-libvulkan-path phase. Add 'patch-source-wine-staging phase. --- gnu/packages/wine.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 836ed0666e..e23dcc55f1 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -334,13 +334,13 @@ integrated into the main branch.") (string-append "libdir=" %output "/lib/wine64")) #:phases (modify-phases %standard-phases - (add-before 'configure 'hardcore-libvulkan-path + (add-before 'configure 'patch-source-wine-staging (lambda* (#:key outputs #:allow-other-keys) - (let* ((libvulkan (string-append (assoc-ref %build-inputs - "vulkan-icd-loader") "/lib/libvulkan.so"))) - ;; Hard-code the path to libvulkan.so. - (substitute* "dlls/vulkan/vulkan_thunks.c" (("libvulkan.so") - libvulkan)) + (let* ((source (assoc-ref %build-inputs "source")) + (script (string-append (assoc-ref %build-inputs + "wine-staging-patchset-data") + "/share/wine-staging/patches/patchinstall.sh"))) + (invoke script (string-append "DESTDIR=" ".") "--all") #t))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key outputs #:allow-other-keys) -- cgit 1.4.1