From 65b81db7bb98de7ac3ae7e4faa40089895f8370d Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 18 Oct 2023 09:01:51 +0000 Subject: [PATCH] mpvScripts.simple-mpv-webui: Refactor with `buildLua` --- pkgs/applications/video/mpv/scripts/default.nix | 2 +- .../video/mpv/scripts/simple-mpv-webui.nix | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 63f986c2c41a..9d16deb1c529 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -18,7 +18,7 @@ in lib.recurseIntoAttrs mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { inherit buildLua; }; quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; + simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; }; sponsorblock = callPackage ./sponsorblock.nix { }; thumbfast = callPackage ./thumbfast.nix { inherit buildLua; }; thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index 01f2c3a099fa..7920796b7840 100644 --- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -1,6 +1,6 @@ -{ lib, stdenvNoCC +{ lib, buildLua , fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +buildLua rec { pname = "simple-mpv-ui"; version = "2.1.0"; @@ -11,12 +11,8 @@ stdenvNoCC.mkDerivation rec { sha256 = "1z0y8sdv5mbxznxqh43w5592ym688vkvqg7w26p8cinrhf09pbw8"; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp -r webui.lua webui-page $out/share/mpv/scripts/ - ''; - passthru.scriptName = "webui.lua"; + scriptPath = "webui.lua"; + postInstall = "cp -a webui-page $out/share/mpv/scripts/"; meta = with lib; { description = "A web based user interface with controls for the mpv mediaplayer"; @@ -30,4 +26,3 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; }; } -