Skip to content
This repository has been archived by the owner on Dec 25, 2024. It is now read-only.

Commit

Permalink
fix(wine): install multilib by using script
Browse files Browse the repository at this point in the history
This should fix the issue where arguments like `?arch=ARCH` on the copr repo parameters do not get registered and the build cannot install the packages from that repo.
Cannot test this on my machine for now, so Ill send to GH actions
  • Loading branch information
tulilirockz committed Mar 20, 2024
1 parent 29c96af commit 46aad20
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 28 deletions.
2 changes: 1 addition & 1 deletion config/common/audio/wine-tkg-scripts.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
type: script-nu
scripts:
- winezgui.nu
- wine-setup.nu
23 changes: 0 additions & 23 deletions config/common/audio/wine-tkg.yml

This file was deleted.

12 changes: 12 additions & 0 deletions config/files/shared/libexec/atomic-studio-cli/wine.nu
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,20 @@ export def "main wine" [] {
echo "Usage wine <command>."
}

# Workaround if your wine64 prefix is not working
export def "main wine init" [--no_64_bit] {
rm ~/wine -rf
if $no_64_bit != null {
wineboot -i
}
WINEARCH=win32 wineboot -i
}

# Run anything through wine-tkg
export def "main wine run" [...rest] {
if not ( $"($env.HOME)/.wine" | path exists) {
studio wine init
}
wineserver64
wine64 ...$rest
}
Expand Down
22 changes: 22 additions & 0 deletions config/scripts/wine-setup.nu
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env nu

use lib/std.nu [ARCH]

let FEDORA_MAJOR_VERSION = (run-external --redirect-combine rpm '-E' '%fedora' | complete).stdout

[
$"https://copr.fedorainfracloud.org/coprs/patrickl/pipewire-wineasio/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-pipewire-wineasio-fedora-($FEDORA_MAJOR_VERSION).repo"
$"https://copr.fedorainfracloud.org/coprs/patrickl/yabridge/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-yabridge-fedora-($FEDORA_MAJOR_VERSION).repo"
$"https://copr.fedorainfracloud.org/coprs/patrickl/wine-tkg/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-wine-tkg-fedora-($FEDORA_MAJOR_VERSION).repo?arch=($ARCH)"
$"https://copr.fedorainfracloud.org/coprs/patrickl/wine-mono/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-wine-mono-fedora-($FEDORA_MAJOR_VERSION).repo?arch=($ARCH)"
$"https://copr.fedorainfracloud.org/coprs/patrickl/vkd3d/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-vkd3d-fedora-($FEDORA_MAJOR_VERSION).repo?arch=($ARCH)"
$"https://copr.fedorainfracloud.org/coprs/patrickl/wine-dxvk/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-wine-dxvk-fedora-($FEDORA_MAJOR_VERSION).repo?arch=($ARCH)"
$"https://copr.fedorainfracloud.org/coprs/patrickl/winetricks/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-winetricks-fedora-($FEDORA_MAJOR_VERSION).repo?arch=($ARCH)"
$"https://copr.fedorainfracloud.org/coprs/patrickl/libcurl-gnutls/repo/fedora-($FEDORA_MAJOR_VERSION)/patrickl-libcurl-gnutls-fedora-($FEDORA_MAJOR_VERSION).repo?arch=($ARCH)"
] | each { |e| http get $e | save -a /etc/yum.repos.d/wine-related.repo }

rpm-ostree install wine* wine-dxvk* wine.i686 wine-dxvk.i686 mingw32-wine-gecko mingw64-wine-gecko yabridge pipewire-wineasio libcurl-gnutls icoutils perl-Image-ExifTool

git clone https://github.com/fastrizwaan/WineZGUI /tmp/winezgui
cd /tmp/winezgui
./setup --install
4 changes: 0 additions & 4 deletions config/scripts/winezgui.nu

This file was deleted.

0 comments on commit 46aad20

Please sign in to comment.