diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 06:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-12 06:01:07 +0000 |
| commit | eb26e06e9b4f8d9a173099699ef6b8602c22e329 (patch) | |
| tree | 78ec4dbbae22af7bf9f21fe22a287f990cd045ae /pkgs/applications/video | |
| parent | 597366a4aa9ecdf7d56e452098a43283ba2a67a1 (diff) | |
| parent | 6f314053897165a8c629484836a45d1de1a0e965 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/video/mpv/scripts/thumbfast.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 95681d4a4ab49..33fb4fc782178 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -256,6 +256,7 @@ in stdenv'.mkDerivation (finalAttrs: { ''; changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; + mainProgram = "mpv"; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index fb231d87ca325..88209f049f6bc 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { postPatch = '' substituteInPlace thumbfast.lua \ - --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getBin mpv-unwrapped}/bin/mpv"' + --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"' ''; dontBuild = true; |