HackENS/liminix-fork
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

callPackageify make-image.nix

Browse source
This commit is contained in:
Daniel Barlow 2022-09-26 16:19:14 +01:00
parent c6c6b51893
commit 1c14bb63fa
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
default.nix
View file

@ -10,12 +10,11 @@ let
<liminix-config> <liminix-config>
] nixpkgs.pkgs; ] nixpkgs.pkgs;
finalConfig = config // { finalConfig = config // {
packages = (with nixpkgs.pkgs; [ s6-rc ]) ++ packages = (with nixpkgs.pkgs; [ s6-init-files s6-rc ]) ++
config.systemPackages ++ config.systemPackages ++
(builtins.attrValues config.services) (builtins.attrValues config.services);
;
}; };
squashfs = (import ./make-image.nix) nixpkgs finalConfig; squashfs = (nixpkgs.pkgs.callPackage ./make-image.nix {}) finalConfig;
kernel = nixpkgs.pkgs.callPackage ./kernel { kernel = nixpkgs.pkgs.callPackage ./kernel {
inherit (finalConfig.kernel) config; inherit (finalConfig.kernel) config;
}; };

42
make-image.nix
View file

@ -1,22 +1,27 @@
pkgs: config: {
let
inherit (pkgs)
callPackage
lib
runCommand
s6-rc
s6-init-files
stdenv stdenv
stdenvNoCC , busybox
writeScript , buildPackages
writeText; , callPackage
, execline
s6-rc-db = pkgs.s6-rc-database.override { , lib
, runCommand
, s6-init-bin
, s6-init-files
, s6-linux-init
, s6-rc
, s6-rc-database
, stdenvNoCC
, writeScript
, writeText
} : config :
let
s6-rc-db = s6-rc-database.override {
services = builtins.attrValues config.services; services = builtins.attrValues config.services;
}; };
profile = writeScript ".profile" '' profile = writeScript ".profile" ''
PATH=${lib.makeBinPath (with pkgs; [ s6-init-bin busybox execline s6-linux-init s6-rc])} PATH=${lib.makeBinPath ([ s6-init-bin busybox execline s6-linux-init s6-rc])}
export PATH export PATH
''; '';
@ -38,9 +43,9 @@ let
/sys d 0555 root root /sys d 0555 root root
/dev/pts d 0755 0 0 /dev/pts d 0755 0 0
/etc/init.d d 0755 0 0 /etc/init.d d 0755 0 0
/bin/init s 0755 0 0 ${pkgs.s6-init-bin}/bin/init /bin/init s 0755 0 0 ${s6-init-bin}/bin/init
/bin/sh s 0755 0 0 ${pkgs.busybox}/bin/sh /bin/sh s 0755 0 0 ${busybox}/bin/sh
/bin/busybox s 0755 0 0 ${pkgs.busybox}/bin/busybox /bin/busybox s 0755 0 0 ${busybox}/bin/busybox
/etc/s6-rc d 0755 0 0 /etc/s6-rc d 0755 0 0
/etc/s6-rc/compiled s 0755 0 0 ${s6-rc-db}/compiled /etc/s6-rc/compiled s 0755 0 0 ${s6-rc-db}/compiled
/etc/passwd f 0644 0 0 echo "root::0:0:root:/:/bin/sh" /etc/passwd f 0644 0 0 echo "root::0:0:root:/:/bin/sh"
@ -50,10 +55,9 @@ let
# add pseudofiles to store so that the packages they # add pseudofiles to store so that the packages they
# depend on are also added # depend on are also added
storeContents = [ pseudofiles s6-init-files ] ++ config.packages ; storeContents = [ pseudofiles s6-init-files ] ++ config.packages ;
# comp = "xz -Xdict-size 100%"
}; };
in runCommand "frob-squashfs" { in runCommand "frob-squashfs" {
nativeBuildInputs = with pkgs.buildPackages; [ squashfsTools qprint ]; nativeBuildInputs = with buildPackages; [ squashfsTools qprint ];
} '' } ''
cp ${storefs} ./store.img cp ${storefs} ./store.img
chmod +w store.img chmod +w store.img