diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2023-11-11 22:58:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-11 22:58:39 +0100 |
commit | 81327627c05d231679b049835fb22ee5bb284974 (patch) | |
tree | a881f9309d8f643f6ea9584585f9d621ff7f08b8 | |
parent | e8c0fde6b3826780ee2832afbc4c72373cb87af1 (diff) | |
parent | c2f3e206fe7e390050099d7f20a10042222252ef (diff) |
Merge pull request #266488 from nbraud/mpvScripts/convert
-rw-r--r-- | pkgs/applications/video/mpv/scripts/convert.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/scripts/default.nix | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 40a1050cd324a..4f90b0c62ed05 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, fetchgit, lib +{ lib, fetchgit, buildLua , yad, mkvtoolnix-cli, libnotify }: -stdenvNoCC.mkDerivation { +buildLua { pname = "mpv-convert-script"; version = "2016-03-18"; src = fetchgit { @@ -22,15 +22,9 @@ stdenvNoCC.mkDerivation { 'yad_exe = "${yad}/bin/yad"' \ --replace 'notify_send_exe = "notify-send"' \ 'notify_send_exe = "${libnotify}/bin/notify-send"' \ - ''; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp convert_script.lua $out/share/mpv/scripts - ''; - passthru.scriptName = "convert_script.lua"; + scriptPath = "convert_script.lua"; meta = with lib; { description = "Convert parts of a video while you are watching it in mpv"; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 94c59fa8b0685..cdc641043f374 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -11,7 +11,7 @@ in lib.recurseIntoAttrs autodeint = callPackage ./autodeint.nix { }; autoload = callPackage ./autoload.nix { }; chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; - convert = callPackage ./convert.nix { }; + convert = callPackage ./convert.nix { inherit buildLua; }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; |