writers: use callPackages to import sub-groups of writers
Use callPackages instead of plain import to get proper splicing. Without this, writeNginxConfig fails when cross-compiling.
This commit is contained in:
parent
35abc09040
commit
09dd973987
|
@ -1,17 +1,13 @@
|
||||||
{ pkgs, config, lib }:
|
{ config, lib, callPackages }:
|
||||||
|
|
||||||
let
|
let
|
||||||
aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
|
aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
|
||||||
|
|
||||||
# Writers for JSON-like data structures
|
# Writers for JSON-like data structures
|
||||||
dataWriters = import ./data.nix {
|
dataWriters = callPackages ./data.nix { };
|
||||||
inherit lib; inherit (pkgs) runCommandNoCC dasel;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Writers for scripts
|
# Writers for scripts
|
||||||
scriptWriters = import ./scripts.nix {
|
scriptWriters = callPackages ./scripts.nix { };
|
||||||
inherit lib pkgs;
|
|
||||||
};
|
|
||||||
|
|
||||||
writers = scriptWriters // dataWriters;
|
writers = scriptWriters // dataWriters;
|
||||||
in
|
in
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, lib }:
|
{ pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }:
|
||||||
let
|
let
|
||||||
inherit (lib)
|
inherit (lib)
|
||||||
concatMapStringsSep
|
concatMapStringsSep
|
||||||
|
@ -10,15 +10,6 @@ let
|
||||||
strings
|
strings
|
||||||
types
|
types
|
||||||
;
|
;
|
||||||
|
|
||||||
inherit (pkgs)
|
|
||||||
buildPackages
|
|
||||||
gixy
|
|
||||||
libiconv
|
|
||||||
mkNugetDeps
|
|
||||||
mkNugetSource
|
|
||||||
stdenv
|
|
||||||
;
|
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
# Base implementation for non-compiled executables.
|
# Base implementation for non-compiled executables.
|
||||||
|
|
Loading…
Reference in a new issue