mpv: 0.37.0 -> 0.38.0

[AndersonTorres]

Description of changes

closes #305164

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[davidkna]

@AndersonTorres The darwin patch shouldn't be needed anymore. This also means the package requires darwin.codesign instead of rcodesign again.

Edit: It doesn't build on darwin, it looks like this update might require a more recent apple SDK. (error: value of type 'NSCondition' has no member 'withLock')

[AndersonTorres]

1. I will then delete the patch
2. Still needs Darwin testers, since I am not one of them :)

[AndersonTorres]

What is happening that this expression is not building?

[JohnRTitor]

What is happening that this expression is not building?

If I had to guess it could be related to wrapping mpv? You could try moving it to pkgs/by-name. So there is no import issue.

[AndersonTorres]

by-name - related errors are catched by a specific script, not by ofBorg.

Currently mpv uses that dreadful darwin.apple_sdk.callPackage instead of plain callPackage. It makes the migration impossible.

[AndersonTorres]

@ofborg build mpv-unwrapped

[eclairevoyant]

Currently mpv uses that dreadful darwin.apple_sdk.callPackage instead of plain callPackage. It makes the migration impossible.

It can still be migrated, just changing the path to callPackage accordingly

[AndersonTorres]

It can still be migrated, just changing the path to callPackage accordingly

No, it does not. Saving my fingers:

#305509 (comment)

[eclairevoyant]

Yeah, I just tested and ended up on the same error.
https://github.com/NixOS/nixpkgs-check-by-name/blob/7d6d26de7b271498d003e239b2a62cf22966398f/src/nixpkgs_problem.rs#L273-L277

[marsam]

I'm not completely sure why it fails to eval, but you can use the following as a workaround:

--- i/pkgs/applications/video/mpv/default.nix
+++ w/pkgs/applications/video/mpv/default.nix
@@ -11,6 +11,7 @@
   ninja,
   pkg-config,
   python3,
+  sigtool,
   ffmpeg,
   freefont_ttf,
   freetype,
@@ -210,7 +211,7 @@ stdenv'.mkDerivation (finalAttrs: {
       pkg-config
     ]
     ++ lib.optionals stdenv.isDarwin [
-      darwin.sigtool
+      sigtool
       xcbuild.xcrun
     ]
     ++ lib.optionals swiftSupport [ swift ]
--- i/pkgs/top-level/all-packages.nix
+++ w/pkgs/top-level/all-packages.nix
@@ -33005,6 +33005,7 @@ with pkgs;
 
   mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv {
     stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv;
+    inherit (darwin) sigtool;
     inherit lua;
   }; 

or

--- c/pkgs/applications/video/mpv/default.nix
+++ i/pkgs/applications/video/mpv/default.nix
@@ -22,6 +22,7 @@
   xcbuild,
   rcodesign,
+  buildPackages,
 
   waylandSupport ? stdenv.isLinux,
@@ -210,7 +211,7 @@ stdenv'.mkDerivation (finalAttrs: {
       pkg-config
     ]
     ++ lib.optionals stdenv.isDarwin [
-      darwin.sigtool
+      buildPackages.darwin.sigtool
       xcbuild.xcrun
     ]

[AndersonTorres]

Let's try.

P.S.: can I put this on the account of splicing?

[AndersonTorres]

OfBorg is now all-green.
Anything more to be done?

[marsam]

Anything more to be done?

please mark it as broken on Darwin. I'll try to fix it later

[marsam]

LGTM, Thank you!
But since it seems to break the package on Darwin, I think it should be merged after the 24.05 branch-off (planned to happen in a couple of days).