wine64Packages.{stable,unstable,staging}: use the 14.4 SDK (#346963)

This commit is contained in:
Emily 2024-10-11 01:55:34 +01:00 committed by GitHub
commit c586a772f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 16 deletions

View File

@ -6,7 +6,7 @@
wineRelease,
patches,
moltenvk,
buildScript ? null, configureFlags ? [], mainProgram ? "wine"
buildScript ? null, configureFlags ? [], mainProgram ? "wine",
}:
with import ./util.nix { inherit lib; };
@ -23,12 +23,10 @@ let
};
} ./setup-hook-darwin.sh;
darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin (
toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
])
);
# Using the 14.4 SDK allows Wine to use `os_sync_wait_on_address` for its futex implementation on Darwin.
# It does an availability check, so older systems will still work.
darwinFrameworks = toBuildInputs pkgArches (pkgs: [ pkgs.apple-sdk_14 ]);
# Building Wine with these flags isnt supported on Darwin. Using any of them will result in an evaluation failures
# because they will put Darwin in `meta.badPlatforms`.
darwinUnsupportedFlags = [

View File

@ -38252,15 +38252,6 @@ with pkgs;
winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {
callPackage = newScope self;
stdenv =
if pkgs.stdenv.hostPlatform.isDarwin then
# Match upstream, which builds with the latest SDK and a 10.7 deployment target.
overrideSDK pkgs.stdenv {
darwinMinVersion = "10.7";
darwinSdkVersion = "11.0";
}
else
pkgs.stdenv;
inherit wineBuild;