mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #131574 from SFrijters/wine-6.13

Browse source 
wine{Unstable,Staging}: 6.12 -> 6.13
This commit is contained in:
Ben Siraphob 2021-07-27 09:28:37 +07:00 committed by GitHub
parent 456ac9c646 cf9c9cae38
commit 3ddfb199d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/misc/emulators/wine/sources.nix
View file

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.12";
version = "6.13";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "1a6fnxb4rci310m0wjcs9cnmpj88775q70qk7xi3k06z1qqbx4pv";
sha256 = "sha256-4DohoBHUXSrp8iIED7dpC5cVY3bnQx+GHyAHPq8k8oo=";
inherit (stable) gecko32 gecko64;
## see http://wiki.winehq.org/Mono
@ -65,11 +65,10 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "1mg5yrw5jk2nbdp9mcqc3iar01lr76lmm1py95wify9p2bqzavpp";
sha256 = "sha256-3IpO+eQ/+DiQZH6en5Q/p+j441LDvjn4i9Ex7PY8KCk=";
owner = "wine-staging";
repo = "wine-staging";
# Replace back on next release: rev = "v${version}";
rev = "v6.12.1";
rev = "v${version}";
disabledPatchsets = [ ];
};

5
pkgs/tools/misc/pipelight/default.nix
View file

@ -21,7 +21,10 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
patches = [ ./pipelight.patch ];
patches = [
./pipelight.patch
./wine-6.13-new-args.patch
];
configurePhase = ''
patchShebangs .

42
pkgs/tools/misc/pipelight/wine-6.13-new-args.patch Normal file
View file

@ -0,0 +1,42 @@
diff --git a/src/windows/pluginloader/apihook.c b/src/windows/pluginloader/apihook.c
index 80bf726..6b80f70 100644
--- a/src/windows/pluginloader/apihook.c
+++ b/src/windows/pluginloader/apihook.c
@@ -42,7 +42,9 @@
#include "common/common.h"
#include "pluginloader.h"
+#define new cnew
#include <windows.h> // for PVOID and other types
+#undef new
#include <string.h> // for memset
void* patchDLLExport(PVOID ModuleBase, const char* functionName, void* newFunctionPtr){
diff --git a/src/windows/pluginloader/npnfunctions.c b/src/windows/pluginloader/npnfunctions.c
index e4e38aa..19f29d5 100644
--- a/src/windows/pluginloader/npnfunctions.c
+++ b/src/windows/pluginloader/npnfunctions.c
@@ -41,7 +41,9 @@
#include "common/common.h"
#include "pluginloader.h"
+#define new cnew
#include <windows.h>
+#undef new
/* Shockwave sometimes calls the function with a wrong instance? Is this a wine bug? */
NPP shockwaveInstanceBug = NULL;
diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c
index 8f1170a..99dbceb 100644
--- a/src/windows/pluginloader/pluginloader.c
+++ b/src/windows/pluginloader/pluginloader.c
@@ -50,7 +50,9 @@
#include "pluginloader.h"
#include "apihook.h"
+#define new cnew
#include <windows.h>
+#undef new
#include <objbase.h> // for CoInitializeEx
#include <GL/gl.h>