newedge/liminix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename systemPackages as defaultProfile.packages

Browse Source 
it doesn't work the same way as in nixos, so don't name it the same way
This commit is contained in:
Daniel Barlow
2022-09-27 16:17:55 +01:00
parent 4cbe669783
commit 696bbe6521
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/liminix-tools/builders/squashfs.nix
View File

@@ -8,15 +8,15 @@
, writeText
} : config :
let
config-pseudofiles = pseudofile.write "config.etc"
(config.environment.contents);
pseudofiles =
pseudofile.write "config.etc" (config.environment.contents);
storefs = callPackage <nixpkgs/nixos/lib/make-squashfs.nix> {
# add pseudofiles as packages to store so that the packages they
# depend on are also added
storeContents = [
config-pseudofiles
] ++ config.packages ;
# 1) Every required package is referenced from somewhere
# outside /nix/store. 2) Every file outside the store is
# specified by config.environment. 3) Therefore, closing over
# the pseudofile will give us all the needed packages
storeContents = [ pseudofiles ];
};
in runCommand "frob-squashfs" {
nativeBuildInputs = with buildPackages; [ squashfsTools qprint ];
@@ -24,6 +24,6 @@ in runCommand "frob-squashfs" {
cp ${storefs} ./store.img
chmod +w store.img
mksquashfs - store.img -no-recovery -quiet -no-progress -root-becomes store -p "/ d 0755 0 0"
mksquashfs - store.img -no-recovery -quiet -no-progress -root-becomes nix -p "/ d 0755 0 0" -pf ${config-pseudofiles}
mksquashfs - store.img -no-recovery -quiet -no-progress -root-becomes nix -p "/ d 0755 0 0" -pf ${pseudofiles}
cp store.img $out
''