Commit cdc6ed5c authored by nicoo's avatar nicoo
Browse files

mpvScripts.cutter: simplify with `buildLua`

parent 6ac78f11

pkgs/applications/video/mpv/scripts/cutter.nix

+6 −10
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper }:

{ lib, buildLua, fetchFromGitHub, makeWrapper }:



stdenvNoCC.mkDerivation {

buildLua {

  pname = "video-cutter";

  version = "unstable-2021-02-03";
@@ -11,9 +11,6 @@ stdenvNoCC.mkDerivation { 
    sha256 = "sha256-ramID1DPl0UqEzevpqdYKb9aaW3CAy3Dy9CPb/oJ4eY=";

  };



  dontBuild = true;

  dontCheck = true;



  nativeBuildInputs = [ makeWrapper ];



  postPatch = ''
@@ -27,16 +24,15 @@ stdenvNoCC.mkDerivation { 
      --replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter"

  '';



  installPhase = ''

    install -Dm755 c_concat.sh $out/share/mpv/scripts/c_concat.sh

    install cutter.lua $out/share/mpv/scripts/cutter.lua

  passthru.scriptName = "cutter.lua";

  extraScripts = [ "c_concat.sh" ];



  postInstall = ''

    chmod 0755 $out/share/mpv/scripts/c_concat.sh

    wrapProgram $out/share/mpv/scripts/c_concat.sh \

      --run "mkdir -p ~/.config/mpv/cutter/"

  '';



  passthru.scriptName = "cutter.lua";



  meta = with lib; {

    description = "Cut videos and concat them automatically";

    homepage = "https://github.com/rushmj/mpv-video-cutter";

pkgs/applications/video/mpv/scripts/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ in lib.recurseIntoAttrs 
    autoload = callPackage ./autoload.nix { };

    chapterskip = callPackage ./chapterskip.nix { inherit buildLua; };

    convert = callPackage ./convert.nix { inherit buildLua; };

    cutter = callPackage ./cutter.nix { inherit buildLua; };

    inhibit-gnome = callPackage ./inhibit-gnome.nix { };

    mpris = callPackage ./mpris.nix { };

    mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; };
@@ -26,7 +27,6 @@ in lib.recurseIntoAttrs 
    visualizer = callPackage ./visualizer.nix { };

    vr-reversal = callPackage ./vr-reversal.nix { };

    webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };

    cutter = callPackage ./cutter.nix { };

  }

  // (callPackage ./occivink.nix { inherit buildLua; }))

  // lib.optionalAttrs config.allowAliases {