From 444a5231810e2575bb8955bca6492ef73e4388d5 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sat, 2 Nov 2024 18:25:48 +0100
Subject: fix(lib/maybeMerge): Actually output a warning if things will be
 overridden

---
 pkgs/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'pkgs')

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);
 
-- 
cgit 1.4.1