cross: remove upstreamed mpv patch

This commit is contained in:
Colin 2023-11-27 14:22:24 +00:00
parent b74f55cf54
commit 1d61834a95

View File

@ -1359,18 +1359,6 @@ in {
# # '';
# });
mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (upstream: {
# 2023/11/21: upstreaming is in PR: <https://github.com/NixOS/nixpkgs/pull/269165>
# nativeBuildInputs = lib.remove final.python3 upstream.nativeBuildInputs;
# umpv gets the build python, somehow -- even with python3 removed from nativeBuildInputs.
# and mpv_identify.sh gets the build bash.
# patch these both to use the host files
buildInputs = (upstream.buildInputs or []) ++ [ final.bash final.python3 ];
postFixup = (upstream.postFixup or "") + ''
patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh
'';
});
# mpvScripts = prev.mpvScripts // {
# # "line 1: pkg-config: command not found"
# # "mpris.c:1:10: fatal error: gio/gio.h: No such file or directory"