From b09edde79e2735cfee92ff3b0a979b0ee120754a Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 29 Nov 2023 11:20:20 +0000 Subject: [PATCH 1/3] 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"; From dc18dc4a023df9d16f417cf598e53ec484ea41e0 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 29 Nov 2023 11:25:00 +0000 Subject: [PATCH 2/3] =?UTF-8?q?mpvScripts.mpv-webm:=20unstable-2023-02-23?= =?UTF-8?q?=20=E2=86=92=202023-11-18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/mpv/scripts/mpv-webm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index bcfb69449c1a..2bf189511dcc 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -6,13 +6,13 @@ buildLua { pname = "mpv-webm"; - version = "unstable-2023-02-23"; + version = "unstable-2023-11-18"; src = fetchFromGitHub { owner = "ekisu"; repo = "mpv-webm"; - rev = "a18375932e39e9b2a40d9c7ab52ea367b41e2558"; - hash = "sha256-aetkQ1gU/6Yys5FJS/N06ED9tCSvL6BAgUGdNmNmpbU="; + rev = "6b5863f68275b3dc91c2507284c039ec8a4cbd97"; + hash = "sha256-rJamBm6FyxWcJO7VXXOUTO9piWCkPfEVdqGKGeJ/h0c="; }; dontBuild = false; From f171058dcc574168b9e683ef1dae2bd97e7b9d8d Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 29 Nov 2023 11:37:16 +0000 Subject: [PATCH 3/3] mpvScripts.mpv-webm: Set `updateScript` --- pkgs/applications/video/mpv/scripts/mpv-webm.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index 2bf189511dcc..b155846750dc 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -2,6 +2,7 @@ , buildLua , fetchFromGitHub , luaPackages +, nix-update-script }: buildLua { @@ -19,6 +20,10 @@ buildLua { nativeBuildInputs = [ luaPackages.moonscript ]; scriptPath = "build/webm.lua"; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + meta = with lib; { description = "Simple WebM maker for mpv, with no external dependencies"; homepage = "https://github.com/ekisu/mpv-webm";