diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-06 18:59:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 18:59:09 +0200 |
| commit | 5c4218eb6953b1dc77b2fd1971021a256ea612de (patch) | |
| tree | 17ac3a9d5e53411d80c2e9f6f08ea63cfbe18f71 /pkgs/applications/emulators | |
| parent | e91eea4f1725f3af681ee2123ad44cf73fbc6d39 (diff) | |
| parent | 1d79811a4211ad6f1b9f9f2b4279145ec531f92c (diff) | |
Merge pull request #219794 from reckenrode/darwin-wine-8.x-fix
wine: fix build failure on Darwin
Diffstat (limited to 'pkgs/applications/emulators')
| -rw-r--r-- | pkgs/applications/emulators/wine/base.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/emulators/wine/darwin-qos.patch | 12 |
2 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index ed9e24a910f61..28efcf5875bfb 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -108,9 +108,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]))); patches = [ ] - # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available - # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. - ++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch + ++ lib.optionals stdenv.isDarwin [ + # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available + # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. + ./darwin-metal-compat.patch + # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. + ./darwin-qos.patch + ] ++ patches'; configureFlags = prevConfigFlags diff --git a/pkgs/applications/emulators/wine/darwin-qos.patch b/pkgs/applications/emulators/wine/darwin-qos.patch new file mode 100644 index 0000000000000..e9bd813feaab0 --- /dev/null +++ b/pkgs/applications/emulators/wine/darwin-qos.patch @@ -0,0 +1,12 @@ +diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c +index cde37c48b0d..be237bc0ad3 100644 +--- a/dlls/ntdll/unix/loader.c ++++ b/dlls/ntdll/unix/loader.c +@@ -65,6 +65,7 @@ + # undef LoadResource + # undef GetCurrentThread + # include <pthread.h> ++# include <pthread/qos.h> + # include <mach/mach.h> + # include <mach/mach_error.h> + # include <mach-o/getsect.h> |