use latest winetricks
This commit is contained in:
parent
55018c6b7c
commit
6490e7ca9b
4 changed files with 55 additions and 0 deletions
|
|
@ -35,6 +35,7 @@
|
||||||
polybar
|
polybar
|
||||||
picom
|
picom
|
||||||
wine-osu
|
wine-osu
|
||||||
|
winetricks
|
||||||
];
|
];
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
linux = import ./overlays/linux.nix;
|
linux = import ./overlays/linux.nix;
|
||||||
picom = import ./overlays/picom.nix;
|
picom = import ./overlays/picom.nix;
|
||||||
polybar = import ./overlays/polybar.nix;
|
polybar = import ./overlays/polybar.nix;
|
||||||
|
winetricks = import ./overlays/winetricks.nix;
|
||||||
discord = (self: super: {
|
discord = (self: super: {
|
||||||
discord-canary = super.discord-canary.override rec {
|
discord-canary = super.discord-canary.override rec {
|
||||||
version = "0.0.123";
|
version = "0.0.123";
|
||||||
|
|
|
||||||
12
overlays/winetricks.nix
Normal file
12
overlays/winetricks.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
self: super: {
|
||||||
|
winetricks = super.winetricks.overrideAttrs(old: rec {
|
||||||
|
name = "winetricks-20210525-b9030c4";
|
||||||
|
src = super.fetchFromGitHub {
|
||||||
|
repo = "winetricks";
|
||||||
|
owner = "Winetricks";
|
||||||
|
rev = "b90e0c4e7cea9acc2c9e89bc4afe873086bbd8a1";
|
||||||
|
sha256 = "11adhgd8zavz4c9yzj0m5570fq7wv6am2wq4j9xkz2655fw2412l";
|
||||||
|
};
|
||||||
|
patches = [ ./winetricks.patch ];
|
||||||
|
});
|
||||||
|
}
|
||||||
41
overlays/winetricks.patch
Normal file
41
overlays/winetricks.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
diff --git a/src/winetricks b/src/winetricks
|
||||||
|
index 6bb8f8f..1d69c22 100755
|
||||||
|
--- a/src/winetricks
|
||||||
|
+++ b/src/winetricks
|
||||||
|
@@ -12453,8 +12453,7 @@ load_vcrun2005()
|
||||||
|
# 2011/06: Security update, see
|
||||||
|
# https://technet.microsoft.com/library/security/ms11-025 or
|
||||||
|
# https://support.microsoft.com/kb/2538242
|
||||||
|
- w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29
|
||||||
|
-
|
||||||
|
+ w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 8648c5fc29c44b9112fe52f9a33f80e7fc42d10f3b5b42b2121542a13e44adfd
|
||||||
|
# For native to be used, msvc* dlls must either be set to native only, OR
|
||||||
|
# set to native, builtin and remove wine's builtin manifest. Setting to native only breaks several apps,
|
||||||
|
# e.g., Dirac Codec and Ragnarok Online.
|
||||||
|
@@ -12468,7 +12467,7 @@ load_vcrun2005()
|
||||||
|
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/q}
|
||||||
|
|
||||||
|
if [ "${W_ARCH}" = "win64" ] ;then
|
||||||
|
- w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 0551a61c85b718e1fa015b0c3e3f4c4eea0637055536c00e7969286b4fa663e0
|
||||||
|
+ w_download https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 4487570bd86e2e1aac29db2a1d0a91eb63361fcaac570808eb327cd4e0e2240d
|
||||||
|
w_try "${WINE}" vcredist_x64.exe ${W_OPT_UNATTENDED:+/q}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
@@ -12483,7 +12482,7 @@ w_metadata mfc80 dlls \
|
||||||
|
|
||||||
|
load_mfc80()
|
||||||
|
{
|
||||||
|
- w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29
|
||||||
|
+ w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE 8648c5fc29c44b9112fe52f9a33f80e7fc42d10f3b5b42b2121542a13e44adfd
|
||||||
|
|
||||||
|
w_try_cabextract --directory="${W_TMP}/win32" "${W_CACHE}"/vcrun2005/vcredist_x86.EXE -F 'vcredist.msi'
|
||||||
|
w_try_cabextract --directory="${W_TMP}/win32" "${W_TMP}/win32/vcredist.msi"
|
||||||
|
@@ -12494,7 +12493,7 @@ load_mfc80()
|
||||||
|
w_try cp "${W_TMP}/win32"/mfcm80u.dll.8.0.50727.6195.9BAE13A2_E7AF_D6C3_FF1F_C8B3B9A1E18E "${W_SYSTEM32_DLLS}"/mfcm80u.dll
|
||||||
|
|
||||||
|
if [ "${W_ARCH}" = "win64" ]; then
|
||||||
|
- w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 0551a61c85b718e1fa015b0c3e3f4c4eea0637055536c00e7969286b4fa663e0
|
||||||
|
+ w_download_to vcrun2005 https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x64.EXE 4487570bd86e2e1aac29db2a1d0a91eb63361fcaac570808eb327cd4e0e2240d
|
||||||
|
|
||||||
|
w_try_cabextract --directory="${W_TMP}/win64" "${W_CACHE}"/vcrun2005/vcredist_x64.EXE -F 'vcredist.msi'
|
||||||
|
w_try_cabextract --directory="${W_TMP}/win64" "${W_TMP}/win64/vcredist.msi"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue