diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-12-04 00:45:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-04 00:45:01 +0100 |
| commit | 66c54c2291bea2ef664bc08db3eaf5032e1b48d2 (patch) | |
| tree | e6e2ee1be7948cc810d7811c8b27433ecdec4223 /pkgs/applications/video/mpv | |
| parent | 2325bbcf3310c20c4ad3531a6d30bc5fec80a0e0 (diff) | |
| parent | f171058dcc574168b9e683ef1dae2bd97e7b9d8d (diff) | |
| download | nixlib-66c54c2291bea2ef664bc08db3eaf5032e1b48d2.tar nixlib-66c54c2291bea2ef664bc08db3eaf5032e1b48d2.tar.gz nixlib-66c54c2291bea2ef664bc08db3eaf5032e1b48d2.tar.bz2 nixlib-66c54c2291bea2ef664bc08db3eaf5032e1b48d2.tar.lz nixlib-66c54c2291bea2ef664bc08db3eaf5032e1b48d2.tar.xz nixlib-66c54c2291bea2ef664bc08db3eaf5032e1b48d2.tar.zst nixlib-66c54c2291bea2ef664bc08db3eaf5032e1b48d2.zip | |
Merge pull request #270920 from nbraud/mpvScripts/mpv-webm
mpvScripts.mpv-webm: unstable-2023-02-23 → 2023-11-18
Diffstat (limited to 'pkgs/applications/video/mpv')
| -rw-r--r-- | pkgs/applications/video/mpv/scripts/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/mpv/scripts/mpv-webm.nix | 24 |
2 files changed, 12 insertions, 14 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..b155846750dc 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -1,30 +1,28 @@ { lib -, stdenvNoCC +, buildLua , fetchFromGitHub , luaPackages +, nix-update-script }: -stdenvNoCC.mkDerivation { +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; nativeBuildInputs = [ luaPackages.moonscript ]; + scriptPath = "build/webm.lua"; - 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"; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = with lib; { description = "Simple WebM maker for mpv, with no external dependencies"; |