diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-13 19:12:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 19:12:27 +0200 |
| commit | e63d54b4aa3a7eb1fbb32a54235d1ec0e3570db1 (patch) | |
| tree | 75c36efb2a31904378b3f4a8f45fda8b50429c24 /pkgs/applications/video | |
| parent | 56fe3498c473086dead3bd17fab878850197f1de (diff) | |
| parent | f1f5d46e64e0d521ef0b9adcab05f5572cf41f59 (diff) | |
Merge pull request #319273 from XYenon/fix/mpv-unwrapped
mpv-unwrapped: fix build on x86_64-darwin
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4600cfb48cb6a..0f9cec9c409bd 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -121,17 +121,14 @@ let overrideSDK = platform: version: - platform - // lib.optionalAttrs (platform ? darwinMinVersion) { - darwinMinVersion = version; - }; + platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; }; stdenv' = if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 then stdenv.override (old: { - buildPlatform = overrideSDK old.buildPlatform "10.15"; - hostPlatform = overrideSDK old.hostPlatform "10.15"; - targetPlatform = overrideSDK old.targetPlatform "10.15"; + buildPlatform = overrideSDK old.buildPlatform "11.0"; + hostPlatform = overrideSDK old.hostPlatform "11.0"; + targetPlatform = overrideSDK old.targetPlatform "11.0"; }) else stdenv; @@ -357,9 +354,7 @@ stdenv'.mkDerivation (finalAttrs: { tests = { inherit (nixosTests) mpv; - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; moduleNames = [ "mpv" ]; |