diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-07-27 09:28:37 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 09:28:37 +0700 |
| commit | 3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8 (patch) | |
| tree | d459882c99739eed02477b4f8f4491bb93ac6f72 /pkgs/tools | |
| parent | 456ac9c646c6bcdbf81c63e42f8941904da2435a (diff) | |
| parent | cf9c9cae38d7a27fdc46f1decce7a1f281fdf862 (diff) | |
| download | nixpkgs-3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8.tar nixpkgs-3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8.tar.gz nixpkgs-3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8.tar.bz2 nixpkgs-3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8.tar.lz nixpkgs-3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8.tar.xz nixpkgs-3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8.tar.zst nixpkgs-3ddfb199d8f7cdbae7c1be07ea9782fd0e2113c8.zip | |
Merge pull request #131574 from SFrijters/wine-6.13
wine{Unstable,Staging}: 6.12 -> 6.13Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/pipelight/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/misc/pipelight/wine-6.13-new-args.patch | 42 |
2 files changed, 46 insertions, 1 deletions
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 96027677fa8..a5a5b727a8d 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -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 . diff --git a/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch b/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch new file mode 100644 index 00000000000..b67af621f64 --- /dev/null +++ b/pkgs/tools/misc/pipelight/wine-6.13-new-args.patch @@ -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> + |