From 8fb207dbb8c944847cc523f844fd05b6e7fe6fae Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 6 Apr 2022 14:05:08 +0200
Subject: ...

---
 system-profiles/core.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'system-profiles')

diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index c808e123..6a38d9ce 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -36,9 +36,9 @@ in {
     networking.hostName = hostName;
     system.configurationRevision = lib.mkIf (flake ? rev) flake.rev;
 
-    nixpkgs.pkgs = import flake.legacyPackages.${config.nixpkgs.system}.path {
-      inherit (config.nixpkgs) system config;
-      overlays = lib.attrValues (lib.filterAttrs (n: _v: n != "default") flake.overlays);
+    nixpkgs.pkgs = flake.legacyPackages.${config.nixpkgs.system}.override {
+      inherit (config.nixpkgs) config;
+      localSystem = config.nixpkgs.system;
     };
 
     nix = {
@@ -52,11 +52,13 @@ in {
         experimental-features = nix-command flakes
       '';
       nixPath = [
-        "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}"
+        "nixpkgs=${flakeInputs.nixpkgs.outPath}"
         "nixpkgs-overlays=${pkgs.writeText "overlays.nix" ''
-          builtins.attrValues (import
+          with builtins;
+
+          attrValues (import
             (
-              let lock = builtins.fromJSON (builtins.readFile ${toString ../flake.lock}); in
+              let lock = fromJSON (readFile ${toString ../flake.lock}); in
               fetchTarball {
                 url = "https://github.com/edolstra/flake-compat/archive/''${lock.nodes.flake-compat.locked.rev}.tar.gz";
                 sha256 = lock.nodes.flake-compat.locked.narHash;
-- 
cgit v1.2.3