lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

remove redundant nixpkgs.pkgs

Browse source
This commit is contained in:
Daniel Barlow 2022-10-19 17:10:35 +01:00
parent 3ef30056c4
commit d1dda7bf74
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
default.nix
View file

@ -6,7 +6,7 @@
let let
overlay = import ./overlay.nix; overlay = import ./overlay.nix;
nixpkgs = import <nixpkgs> (device.system // {overlays = [overlay device.overlay]; }); nixpkgs = import <nixpkgs> (device.system // {overlays = [overlay device.overlay]; });
inherit (nixpkgs.pkgs) callPackage writeText liminix; inherit (nixpkgs) callPackage writeText liminix fetchFromGitHub;
inherit (nixpkgs.lib) concatStringsSep; inherit (nixpkgs.lib) concatStringsSep;
config = (import ./merge-modules.nix) [ config = (import ./merge-modules.nix) [
./modules/base.nix ./modules/base.nix
@ -15,7 +15,7 @@ let
./modules/s6 ./modules/s6
./modules/users.nix ./modules/users.nix
(if phram then ./modules/phram.nix else (args: {})) (if phram then ./modules/phram.nix else (args: {}))
] nixpkgs.pkgs; ] nixpkgs;
squashfs = liminix.builders.squashfs config.filesystem.contents; squashfs = liminix.builders.squashfs config.filesystem.contents;
kernel = callPackage ./kernel { kernel = callPackage ./kernel {
inherit (config.kernel) config checkedConfig; inherit (config.kernel) config checkedConfig;
@ -33,7 +33,7 @@ let
inherit (kernel) vmlinux; inherit (kernel) vmlinux;
inherit dtb; inherit dtb;
}; };
combined-image = nixpkgs.pkgs.runCommand "firmware.bin" { combined-image = nixpkgs.runCommand "firmware.bin" {
nativeBuildInputs = [ nixpkgs.buildPackages.ubootTools ]; nativeBuildInputs = [ nixpkgs.buildPackages.ubootTools ];
} '' } ''
mkdir $out mkdir $out
@ -48,7 +48,7 @@ let
squashfsSize = 8; squashfsSize = 8;
cmd = "mtdparts=phram0:${toString squashfsSize}M(nix) phram.phram=phram0,0x${toHexString squashfsStart},${toString squashfsSize}Mi memmap=${toString squashfsSize}M\$0x${toHexString squashfsStart} root=1f00"; cmd = "mtdparts=phram0:${toString squashfsSize}M(nix) phram.phram=phram0,0x${toHexString squashfsStart},${toString squashfsSize}Mi memmap=${toString squashfsSize}M\$0x${toHexString squashfsStart} root=1f00";
in in
nixpkgs.pkgs.buildPackages.writeScript "firmware.bin" '' nixpkgs.buildPackages.writeScript "firmware.bin" ''
setenv serverip 192.168.8.148 setenv serverip 192.168.8.148
setenv ipaddr 192.168.8.251 setenv ipaddr 192.168.8.251
setenv bootargs '${concatStringsSep " " config.boot.commandLine} ${cmd}' setenv bootargs '${concatStringsSep " " config.boot.commandLine} ${cmd}'
@ -56,7 +56,7 @@ let
bootm 0x${toHexString uimageStart} bootm 0x${toHexString uimageStart}
''; '';
directory = nixpkgs.pkgs.runCommand "liminix" {} ('' directory = nixpkgs.runCommand "liminix" {} (''
mkdir $out mkdir $out
cd $out cd $out
ln -s ${squashfs} squashfs ln -s ${squashfs} squashfs
@ -72,7 +72,7 @@ let
# this exists so that you can run "nix-store -q --tree" on it and find # this exists so that you can run "nix-store -q --tree" on it and find
# out what's in the image, which is nice if it's unexpectedly huge # out what's in the image, which is nice if it's unexpectedly huge
manifest = writeText "manifest.json" (builtins.toJSON config.filesystem.contents); manifest = writeText "manifest.json" (builtins.toJSON config.filesystem.contents);
tftpd = nixpkgs.pkgs.buildPackages.tufted; tftpd = nixpkgs.buildPackages.tufted;
}; };
in { in {
outputs = outputs // { default = outputs.${device.outputs.default}; }; outputs = outputs // { default = outputs.${device.outputs.default}; };