diff options
-rw-r--r-- | pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch | 2 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch b/pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch index 35ca32653a36f..74ab97db4e540 100644 --- a/pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch +++ b/pkgs/applications/video/mpv/darwin-sigtool-no-deep.patch @@ -7,7 +7,7 @@ index 98699e478b..d02ecf610e 100755 def sign_bundle(binary_name): - sh('codesign --force --deep -s - ' + bundle_path(binary_name)) -+ sh('codesign --force -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 88c13cf1c105e..02c3aa2ad17a4 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -20,7 +20,7 @@ , libuchardet , libiconv , xcbuild -, sigtool +, rcodesign , waylandSupport ? stdenv.isLinux , wayland @@ -156,7 +156,7 @@ in stdenv'.mkDerivation (finalAttrs: { ninja pkg-config ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun rcodesign ] ++ lib.optionals swiftSupport [ swift ] ++ lib.optionals waylandSupport [ wayland-scanner ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d723c44520da2..bf71f07f15a9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33765,7 +33765,6 @@ with pkgs; mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv { stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; inherit lua; - inherit (darwin) sigtool; # otherwise it breaks splicing... }; shaka-packager = callPackage ../applications/video/shaka-packager { }; |