pass inputs in container friendly way

This commit is contained in:
zuckerberg
2021-09-24 13:53:36 -04:00
parent de9c03977b
commit b7f6576d64
6 changed files with 32 additions and 26 deletions

View File

@@ -1,4 +1,4 @@
{ lib, pkgs, config, inputs, ... }:
{ lib, pkgs, config, ... }:
with lib;
let
cfg = config.nix.flakes;
@@ -15,7 +15,7 @@ in {
'';
# pin nixpkgs for system commands such as "nix shell"
registry.nixpkgs.flake = inputs.nixpkgs;
registry.nixpkgs.flake = config.inputs.nixpkgs;
};
};
}

View File

@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, ... }:
{ config, pkgs, lib, ... }:
let
cfg = config.services.drastikbot;
@@ -9,9 +9,9 @@ let
format = "other";
srcs = [
inputs.drastikbot
inputs.drastikbot_modules
inputs.dailybuild_modules
config.inputs.drastikbot
config.inputs.drastikbot_modules
config.inputs.dailybuild_modules
];
nativeBuildInputs = [ pkgs.makeWrapper ];

View File

@@ -1,8 +1,8 @@
{ config, pkgs, lib, inputs, system, ... }:
{ config, pkgs, lib, ... }:
let
cfg = config.services.radio;
radioPackage = inputs.radio.packages.${system}.radio;
radioPackage = config.inputs.radio.packages.${builtins.currentSystem}.radio;
in {
options.services.radio = {
enable = lib.mkEnableOption "enable radio";
@@ -47,7 +47,7 @@ in {
services.nginx.virtualHosts.${cfg.host} = lib.mkIf cfg.nginx {
enableACME = true;
forceSSL = true;
locations."/".root = inputs.radio-web;
locations."/".root = config.inputs.radio-web;
};
users.users.${cfg.user} = {