gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #319273 from XYenon/fix/mpv-unwrapped

Browse Source 
mpv-unwrapped: fix build on x86_64-darwin
This commit is contained in:
Sandro
2024-06-13 19:12:27 +02:00
committed by GitHub
parent 56fe3498c4 f1f5d46e64
commit e63d54b4aa
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/mpv/default.nix
+5 -10
View File
@@ -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" ];