cleanup impurities by using modulesPath instead of <nixpkgs>

This commit is contained in:
Maciej Krüger 2021-04-14 16:06:50 +02:00
parent 4e0d60e1e0
commit 343e0c4502
No known key found for this signature in database
GPG Key ID: 0D948CE19CF49C5F
5 changed files with 8 additions and 8 deletions

View File

@ -11,7 +11,7 @@
configFile = pkgs.writeText "configuration.nix"
''
{
imports = [ <nixpkgs/nixos/modules/virtualisation/cloudstack-config.nix> ];
imports = [ "${toString modulesPath}/virtualisation/cloudstack-config.nix" ];
}
'';
};

View File

@ -1,6 +1,6 @@
{ config, pkgs, modulesPath, ... }:
{
system.build.metadata = pkgs.callPackage <nixpkgs/nixos/lib/make-system-tarball.nix> {
system.build.metadata = pkgs.callPackage "${toString modulesPath}/../lib/make-system-tarball.nix" {
contents = [{
source = pkgs.writeText "metadata.yaml" ''
architecture: x86_64

View File

@ -5,7 +5,7 @@
"${toString modulesPath}/virtualisation/lxc-container.nix"
];
system.build.tarball = lib.mkForce (pkgs.callPackage <nixpkgs/nixos/lib/make-system-tarball.nix> {
system.build.tarball = lib.mkForce (pkgs.callPackage "${toString modulesPath}/../lib/make-system-tarball.nix" {
extraArgs = "--owner=0";
storeContents = [
{

View File

@ -1,7 +1,7 @@
{ config, ... }:
{ config, modulesPath, ... }:
{
imports = [
<nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix>
"${toString modulesPath}/installer/cd-dvd/sd-image-aarch64.nix"
];
formatAttr = "sdImage";

View File

@ -1,13 +1,13 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, modulesPath, ... }:
let
extlinux-conf-builder =
import <nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix> {
import "${toString modulesPath}/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix" {
pkgs = pkgs.buildPackages;
};
in {
imports = [
<nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix>
"${toString modulesPath}/installer/cd-dvd/sd-image.nix"
];
boot.loader = {