mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(nix): Minor fixes to derivations for new build process

Browse source
This commit is contained in:
Vincent Ambo 2019-10-01 23:25:51 +01:00 committed by Vincent Ambo
parent 3f40c0a2d2
commit ef2623d168
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/nixery/build-image/build-layers.nix
View file

@ -25,7 +25,7 @@
let
inherit (builtins) fromJSON mapAttrs toJSON;
inherit (pkgs) lib runCommand;
inherit (pkgs) lib runCommand writeText;
pkgs = import loadPkgs { inherit srcType srcArgs importArgs; };

3
tools/nixery/default.nix
View file

@ -44,7 +44,7 @@ in rec {
# are installing Nixery directly.
nixery-bin = writeShellScriptBin "nixery" ''
export WEB_DIR="${nixery-book}"
export PATH="${nixery-build-image}/bin:$PATH"
export PATH="${nixery-build-layers}/bin:${nixery-build-image}/bin:$PATH"
exec ${nixery-server}/bin/nixery
'';
@ -96,6 +96,7 @@ in rec {
iana-etc
nix
nixery-build-image
nixery-build-layers
nixery-launch-script
openssh
zlib