diff options
| author | Stefan Frijters <sfrijters@gmail.com> | 2022-06-06 14:14:16 +0200 |
|---|---|---|
| committer | Stefan Frijters <sfrijters@gmail.com> | 2022-06-06 14:14:16 +0200 |
| commit | aa4fe119c54e6850e72f236aece4166a3039abaa (patch) | |
| tree | 25c779077428e14563ed1f9097e344b0c4d84bee /pkgs/tools/misc/pipelight | |
| parent | d90ca9162d1216e34ad65ae05547fd1e3bf5393c (diff) | |
pipelight: Fix build with wine-7.10
Diffstat (limited to 'pkgs/tools/misc/pipelight')
| -rw-r--r-- | pkgs/tools/misc/pipelight/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch | 26 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index a5a5b727a8deb..9cabb74b231de 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -24,6 +24,9 @@ in stdenv.mkDerivation rec { patches = [ ./pipelight.patch ./wine-6.13-new-args.patch + # https://source.winehq.org/git/wine.git/commit/cf4a781e987a98a8d48610362a20a320c4a1016d + # adds ControlMask as a static variable. + ./wine-7.10-ControlMask.patch ]; configurePhase = '' diff --git a/pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch b/pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch new file mode 100644 index 0000000000000..87280d17788a0 --- /dev/null +++ b/pkgs/tools/misc/pipelight/wine-7.10-ControlMask.patch @@ -0,0 +1,26 @@ +diff --git a/src/windows/pluginloader/pluginloader.c b/src/windows/pluginloader/pluginloader.c +index 751e072..7a4589d 100644 +--- a/src/windows/pluginloader/pluginloader.c ++++ b/src/windows/pluginloader/pluginloader.c +@@ -190,7 +190,7 @@ static inline WPARAM wParamFromX11State(uint32_t state){ + if (state & Button3Mask) wParam |= MK_RBUTTON; + if (state & Button2Mask) wParam |= MK_MBUTTON; + if (state & ShiftMask) wParam |= MK_SHIFT; +- if (state & ControlMask) wParam |= MK_CONTROL; ++ if (state & ControlMask_) wParam |= MK_CONTROL; + return wParam; + } + +diff --git a/src/windows/pluginloader/pluginloader.h b/src/windows/pluginloader/pluginloader.h +index ffe89a7..a1ebabc 100644 +--- a/src/windows/pluginloader/pluginloader.h ++++ b/src/windows/pluginloader/pluginloader.h +@@ -149,7 +149,7 @@ typedef unsigned long int XID; + + #define ShiftMask (1<<0) + #define LockMask (1<<1) +-#define ControlMask (1<<2) ++#define ControlMask_ (1<<2) + #define Button1Mask (1<<8) + #define Button2Mask (1<<9) + #define Button3Mask (1<<10) |