From 51d66a42c56de10d9a10b507fbc7b05f16ff164a Mon Sep 17 00:00:00 2001 From: XYenon Date: Wed, 12 Jun 2024 16:36:40 +0800 Subject: mpv-unwrapped: fix build on x86_64-darwin --- pkgs/applications/video/mpv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4600cfb48cb6a..07b3a37f93f58 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -129,9 +129,9 @@ let 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; -- cgit 1.4.1 From f1f5d46e64e0d521ef0b9adcab05f5572cf41f59 Mon Sep 17 00:00:00 2001 From: XYenon Date: Thu, 13 Jun 2024 11:38:52 +0800 Subject: mpv-unwrapped: format with nixfmt rfc style --- pkgs/applications/video/mpv/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/video') diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 07b3a37f93f58..0f9cec9c409bd 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -121,10 +121,7 @@ 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 @@ -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" ]; -- cgit 1.4.1