diff --git a/overlays/misc/winetricks.patch b/overlays/misc/winetricks.patch deleted file mode 100644 index 56b6b0f..0000000 --- a/overlays/misc/winetricks.patch +++ /dev/null @@ -1,41 +0,0 @@ -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" diff --git a/overlays/winetricks.nix b/overlays/winetricks.nix index 4965e8c..861911a 100644 --- a/overlays/winetricks.nix +++ b/overlays/winetricks.nix @@ -1,12 +1,11 @@ self: super: { winetricks = super.winetricks.overrideAttrs(old: rec { - name = "winetricks-20210525-b9030c4"; + name = "winetricks-20210528-073e2db"; src = super.fetchFromGitHub { repo = "winetricks"; owner = "Winetricks"; - rev = "b90e0c4e7cea9acc2c9e89bc4afe873086bbd8a1"; - sha256 = "11adhgd8zavz4c9yzj0m5570fq7wv6am2wq4j9xkz2655fw2412l"; + rev = "073e2db522e7db56f83fab2338d831ac716264cb"; + sha256 = "1fic4wzc3qyw5bki4zx0h9g8yyhh8db806pwm8mz8qv4n7syk4dd"; }; - patches = [ ./misc/winetricks.patch ]; }); }