From db08290453ae0eb7622648435bf7af187929b153 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Mar 2022 10:59:03 +0100
Subject: Revert "lib.modules: Remove redundant fixupOptionType in option
 injection"

This reverts commit 6b077c47ff14cb9a4a8f5cb8986fa83ff626c732.

Thanks Infinisil for discovering this problem:

> After a lot of trial and error, trying to prove why fixupOptionType should
> be used here or not, I figured it out: It's needed for the sake of file
> locations in error messages.
---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/modules.nix b/lib/modules.nix
index 470e3818820f7..cc045391fcb1f 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -527,7 +527,7 @@ rec {
               #  d. magically combine (a) and (c).
               # All of the above are merely syntax sugar though.
               then
-                let opt = mergeOptionDecls loc (map optionTreeToOption decls);
+                let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls));
                 in {
                   matchedOptions = evalOptionValue loc opt defns';
                   unmatchedDefns = [];
-- 
cgit 1.4.1