From 129d4a230da847d26faf1a1331c67c614d43d49d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 12 Nov 2021 20:19:25 +0100
Subject: modules/lazyPackages: factor out lorri-relevant error message

I want to use the mkWrapper function outside of the vuizvui module,
and this error message would be confusing to have.
---
 modules/core/lazy-packages.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'modules/core')

diff --git a/modules/core/lazy-packages.nix b/modules/core/lazy-packages.nix
index 16f6587e..91c1b8db 100644
--- a/modules/core/lazy-packages.nix
+++ b/modules/core/lazy-packages.nix
@@ -12,16 +12,16 @@ let
   # The command used to fetch the store path from the binary cache.
   fetchSubstitute = "${escapeShellArg "${pkgs.nix}/bin/nix-store"} -r";
 
-  mkWrapper = package: pkgs.runCommandLocal "${package.name}-lazy" {
+  mkWrapper = {package, extraErrorMessage ? ""}: pkgs.runCommandLocal "${package.name}-lazy" {
     inherit package;
+    inherit extraErrorMessage;
   } ''
     encoded="$(echo "$package" | ${encoder})"
 
     if [ ! -e "$package/bin" ]; then
       echo "Store path $package doesn't have a \`bin' directory" \
-           "so we can't create lazy wrappers for it. Please" \
-           "remove \`${escapeShellArg package.name}' from" \
-           "\`vuizvui.lazyPackages'." >&2
+           "so we can't create lazy wrappers for it." \
+           "$extraErrorMessage" >&2
       exit 1
     fi
 
@@ -46,7 +46,12 @@ let
     done
   '';
 
-  wrappers = map mkWrapper config.vuizvui.lazyPackages;
+  vuizvuiWrapper = package: mkWrapper {
+    inherit package;
+    extraErrorMessage = "Please remove `${escapeShellArg package.name}' from `vuizvui.lazyPackages'.";
+  };
+
+  wrappers = map vuizvuiWrapper config.vuizvui.lazyPackages;
 
 in {
   options.vuizvui.lazyPackages = lib.mkOption {
@@ -63,5 +68,5 @@ in {
     '';
   };
 
-  config.environment.systemPackages = map mkWrapper lazyPackages;
+  config.environment.systemPackages = map vuizvuiWrapper lazyPackages;
 }
-- 
cgit 1.4.1