From 4845c937139789c40f7da7ff539ccc40eb62e653 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 31 May 2022 16:00:02 -0700
Subject: [PATCH] beets: fix external plugins in pluginOverrides

---
 pkgs/tools/audio/beets/common.nix  | 12 ++++++------
 pkgs/tools/audio/beets/default.nix |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index d5883f3cdbd..7927c5859ff 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -27,13 +27,13 @@
 let
   inherit (lib) attrNames attrValues concatMap;
 
-  builtinPlugins = import ./builtin-plugins.nix inputs;
-
-  mkPlugin = { enable ? !disableAllPlugins, propagatedBuildInputs ? [ ], testPaths ? [ ], wrapperBins ? [ ] }: {
-    inherit enable propagatedBuildInputs testPaths wrapperBins;
+  mkPlugin = { enable ? !disableAllPlugins, builtin ? false, propagatedBuildInputs ? [ ], testPaths ? [ ], wrapperBins ? [ ] }: {
+    inherit enable builtin propagatedBuildInputs testPaths wrapperBins;
   };
 
-  allPlugins = lib.mapAttrs (_: mkPlugin) (lib.recursiveUpdate builtinPlugins pluginOverrides);
+  basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs);
+  allPlugins = lib.mapAttrs (_: mkPlugin) (lib.recursiveUpdate basePlugins pluginOverrides);
+  builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins;
   enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins;
   disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins;
 
@@ -117,7 +117,7 @@ python3Packages.buildPythonApplication rec {
       \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
       | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
       | sort -u > plugins_available
-    ${diffPlugins (attrNames allPlugins) "plugins_available"}
+    ${diffPlugins (attrNames builtinPlugins) "plugins_available"}
 
     export BEETS_TEST_SHELL="${bashInteractive}/bin/bash --norc"
     export HOME="$(mktemp -d)"
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index a66b018678c..f68a0381e12 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -40,7 +40,7 @@ lib.makeExtensible (self: {
     };
     pluginOverrides = {
       # unstable has a new plugin, so we register it here.
-      limit = { };
+      limit = { builtin = true; };
     };
   };