From 1d61834a95e6194c9510d9c9eb4d977ba2dac157 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 27 Nov 2023 14:22:24 +0000 Subject: [PATCH] cross: remove upstreamed mpv patch --- overlays/cross.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 139847c6..d0f34a52 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -1359,18 +1359,6 @@ in { # # ''; # }); - mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (upstream: { - # 2023/11/21: upstreaming is in PR: - # 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"