summaryrefslogtreecommitdiff
path: root/system-profiles
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-04-06 14:05:08 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-04-06 14:05:08 +0200
commit8fb207dbb8c944847cc523f844fd05b6e7fe6fae (patch)
treed218689404ca881b4aa840f20ed6ac7563c56b1a /system-profiles
parentac4ee9ac159a2de4602b420ba4d16c5cd7040039 (diff)
downloadnixos-8fb207dbb8c944847cc523f844fd05b6e7fe6fae.tar
nixos-8fb207dbb8c944847cc523f844fd05b6e7fe6fae.tar.gz
nixos-8fb207dbb8c944847cc523f844fd05b6e7fe6fae.tar.bz2
nixos-8fb207dbb8c944847cc523f844fd05b6e7fe6fae.tar.xz
nixos-8fb207dbb8c944847cc523f844fd05b6e7fe6fae.zip
...
Diffstat (limited to 'system-profiles')
-rw-r--r--system-profiles/core.nix14
1 files changed, 8 insertions, 6 deletions
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 {
36 networking.hostName = hostName; 36 networking.hostName = hostName;
37 system.configurationRevision = lib.mkIf (flake ? rev) flake.rev; 37 system.configurationRevision = lib.mkIf (flake ? rev) flake.rev;
38 38
39 nixpkgs.pkgs = import flake.legacyPackages.${config.nixpkgs.system}.path { 39 nixpkgs.pkgs = flake.legacyPackages.${config.nixpkgs.system}.override {
40 inherit (config.nixpkgs) system config; 40 inherit (config.nixpkgs) config;
41 overlays = lib.attrValues (lib.filterAttrs (n: _v: n != "default") flake.overlays); 41 localSystem = config.nixpkgs.system;
42 }; 42 };
43 43
44 nix = { 44 nix = {
@@ -52,11 +52,13 @@ in {
52 experimental-features = nix-command flakes 52 experimental-features = nix-command flakes
53 ''; 53 '';
54 nixPath = [ 54 nixPath = [
55 "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}" 55 "nixpkgs=${flakeInputs.nixpkgs.outPath}"
56 "nixpkgs-overlays=${pkgs.writeText "overlays.nix" '' 56 "nixpkgs-overlays=${pkgs.writeText "overlays.nix" ''
57 builtins.attrValues (import 57 with builtins;
58
59 attrValues (import
58 ( 60 (
59 let lock = builtins.fromJSON (builtins.readFile ${toString ../flake.lock}); in 61 let lock = fromJSON (readFile ${toString ../flake.lock}); in
60 fetchTarball { 62 fetchTarball {
61 url = "https://github.com/edolstra/flake-compat/archive/''${lock.nodes.flake-compat.locked.rev}.tar.gz"; 63 url = "https://github.com/edolstra/flake-compat/archive/''${lock.nodes.flake-compat.locked.rev}.tar.gz";
62 sha256 = lock.nodes.flake-compat.locked.narHash; 64 sha256 = lock.nodes.flake-compat.locked.narHash;