From b5e9fd73e09bc4a6da8e34bbc4c1fd54b191041c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 23 Aug 2023 15:51:56 +0200 Subject: [PATCH] feat: remove mpv-visualizer as it has been upstreamed now --- flake.nix | 5 ++++- packages/mpv-visualizer.nix | 36 ------------------------------------ 2 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 packages/mpv-visualizer.nix diff --git a/flake.nix b/flake.nix index 6506aba..f7549a1 100644 --- a/flake.nix +++ b/flake.nix @@ -281,6 +281,9 @@ }) ]; }; + unstablePackages = import nixpkgs-unstable { + inherit system; + }; wrapScript = { packages ? [], name, @@ -334,7 +337,7 @@ mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";}; mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";}; mpv-tv = pkgs.callPackage packages/mpv-tv.nix {}; - mpv-visualizer = pkgs.callPackage packages/mpv-visualizer.nix {}; + mpv-visualizer = unstablePackages.mpvScripts.visualizer; new-mac = pkgs.callPackage packages/new-mac.nix {}; nix-git = pkgs.callPackage packages/nix-git.nix {}; nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;}; diff --git a/packages/mpv-visualizer.nix b/packages/mpv-visualizer.nix deleted file mode 100644 index cca7b87..0000000 --- a/packages/mpv-visualizer.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - curl, - xclip, -}: -stdenvNoCC.mkDerivation rec { - pname = "visualizer"; - version = "unstable-2021-07-10"; - - src = fetchFromGitHub { - owner = "mfcc64"; - repo = "mpv-scripts"; - rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1"; - sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq"; - }; - - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp visualizer.lua $out/share/mpv/scripts - runHook postInstall - ''; - - passthru.scriptName = "visualizer.lua"; - - meta = with lib; { - description = "various audio visualization"; - homepage = "https://github.com/mfcc64/mpv-scripts"; - platforms = platforms.all; - maintainers = with maintainers; [kmein]; - }; -}