From 904a107d16b69f28b9d61c677eb27b953d421a54 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 9 Feb 2023 22:10:30 +0100
Subject: flakes: Ensure that `self.outPath == ./.`

Users expect `self` to refer to the directory where the `flake.nix`
file resides.
---
 src/libexpr/flake/call-flake.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/libexpr/flake')

diff --git a/src/libexpr/flake/call-flake.nix b/src/libexpr/flake/call-flake.nix
index 8061db3df..7dc03e7f5 100644
--- a/src/libexpr/flake/call-flake.nix
+++ b/src/libexpr/flake/call-flake.nix
@@ -9,14 +9,18 @@ let
       (key: node:
         let
 
-          sourceInfo =
+          rawSourceInfo =
             if key == lockFile.root
             then rootSrc
             else fetchTree (node.info or {} // removeAttrs node.locked ["dir"]);
 
           subdir = if key == lockFile.root then rootSubdir else node.locked.dir or "";
 
-          flake = import (sourceInfo + (if subdir != "" then "/" else "") + subdir + "/flake.nix");
+          outPath = rawSourceInfo + ((if subdir == "" then "" else "/") + subdir);
+
+          sourceInfo = rawSourceInfo // { inherit outPath; };
+
+          flake = import (outPath + "/flake.nix");
 
           inputs = builtins.mapAttrs
             (inputName: inputSpec: allNodes.${resolveInput inputSpec})
-- 
cgit v1.2.3