fix(lib/maybeMerge): Actually output a warning if things will be overridden

1 files changed, 1 insertions, 4 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 39d225a9..294d5b91 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -5,10 +5,7 @@
 }: let
   inherit (pkgs) lib;
 
-  # FIXME: Make this override check actually work.
-  # I think that some parts of the lazy eval are causing that to not actually evaluate the
-  # error message. <2024-10-23>
-  maybeMergeMessage = "While merging the pkgs in ./pkgs/by-name to the nixpkgs set.";
+  maybeMergeMessage = "the ./pkgs/by-name set";
   mMM = maybeMergeMessage;
   callPackage = lib.callPackageWith (nixLib.maybeMerge (nixLib.maybeMerge pkgs myPkgs mMM) {inherit sysLib;} mMM);