From b09edde79e2735cfee92ff3b0a979b0ee120754a Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 29 Nov 2023 11:20:20 +0000 Subject: [PATCH] mpvScripts.mpv-webm: Simplify with `buildLua` --- pkgs/applications/video/mpv/scripts/default.nix | 2 +- pkgs/applications/video/mpv/scripts/mpv-webm.nix | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 9d16deb1c529..fb75464ab98e 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -15,7 +15,7 @@ in lib.recurseIntoAttrs inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; - mpv-webm = callPackage ./mpv-webm.nix { }; + mpv-webm = callPackage ./mpv-webm.nix { inherit buildLua; }; mpvacious = callPackage ./mpvacious.nix { inherit buildLua; }; quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; }; diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index 983003d79d71..bcfb69449c1a 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -1,10 +1,10 @@ { lib -, stdenvNoCC +, buildLua , fetchFromGitHub , luaPackages }: -stdenvNoCC.mkDerivation { +buildLua { pname = "mpv-webm"; version = "unstable-2023-02-23"; @@ -15,16 +15,9 @@ stdenvNoCC.mkDerivation { hash = "sha256-aetkQ1gU/6Yys5FJS/N06ED9tCSvL6BAgUGdNmNmpbU="; }; + dontBuild = false; nativeBuildInputs = [ luaPackages.moonscript ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - install -m 644 build/webm.lua $out/share/mpv/scripts/ - runHook postInstall - ''; - - passthru.scriptName = "webm.lua"; + scriptPath = "build/webm.lua"; meta = with lib; { description = "Simple WebM maker for mpv, with no external dependencies";