diff --git a/pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch b/pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch deleted file mode 100644 index 74ab97db4e54..000000000000 --- a/pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/TOOLS/osxbundle.py b/TOOLS/osxbundle.py -index 98699e478b..d02ecf610e 100755 ---- a/TOOLS/osxbundle.py -+++ b/TOOLS/osxbundle.py -@@ -39,7 +39,7 @@ def apply_plist_template(plist_file, version): - print(line.rstrip().replace('${VERSION}', version)) - - def sign_bundle(binary_name): -- sh('codesign --force --deep -s - ' + bundle_path(binary_name)) -+ sh('rcodesign sign ' + bundle_path(binary_name)) - - def bundle_version(): - if os.path.exists('VERSION'): diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ec2acb9656bb..5fd6a8955465 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,5 @@ { lib +, buildPackages , config , stdenv , fetchFromGitHub @@ -19,7 +20,6 @@ , libuchardet , libiconv , xcbuild -, rcodesign , waylandSupport ? stdenv.isLinux , wayland @@ -99,7 +99,7 @@ let else stdenv; in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; - version = "0.37.0"; + version = "0.38.0"; outputs = [ "out" "dev" "doc" "man" ]; @@ -107,11 +107,9 @@ in stdenv'.mkDerivation (finalAttrs: { owner = "mpv-player"; repo = "mpv"; rev = "v${finalAttrs.version}"; - hash = "sha256-izAz9Iiam7tJAWIQkmn2cKOfoaog8oPKq4sOUtp1nvU="; + hash = "sha256-dFajnCpGlNqUv33A8eFEn8kjtzIPkcBY5j0gNVlaiIY="; }; - patches = [ ./darwin-sigtool-no-deep.patch ]; - postPatch = lib.concatStringsSep "\n" [ # Don't reference compile time dependencies or create a build outputs cycle # between out and dev @@ -162,7 +160,7 @@ in stdenv'.mkDerivation (finalAttrs: { ninja pkg-config ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun rcodesign ] + ++ lib.optionals stdenv.isDarwin [ buildPackages.darwin.sigtool xcbuild.xcrun ] ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ];