diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-07-13 16:22:22 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-07-22 11:31:46 +0000 |
| commit | c95e1ffb8c048cef62687d75df6e9b9653e1f57c (patch) | |
| tree | 132e7651adfadb52d9a94365fc9bc63dd1d04f0a /host | |
| parent | 6dfedf90b77e4fda2e375e3f907b8090143856a0 (diff) | |
| download | spectrum-c95e1ffb8c048cef62687d75df6e9b9653e1f57c.tar spectrum-c95e1ffb8c048cef62687d75df6e9b9653e1f57c.tar.gz spectrum-c95e1ffb8c048cef62687d75df6e9b9653e1f57c.tar.bz2 spectrum-c95e1ffb8c048cef62687d75df6e9b9653e1f57c.tar.lz spectrum-c95e1ffb8c048cef62687d75df6e9b9653e1f57c.tar.xz spectrum-c95e1ffb8c048cef62687d75df6e9b9653e1f57c.tar.zst spectrum-c95e1ffb8c048cef62687d75df6e9b9653e1f57c.zip | |
Use stdenvNoCC where possible
This will save having to download gcc and binutils just to change a config file in a VM. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'host')
| -rw-r--r-- | host/initramfs/default.nix | 8 | ||||
| -rw-r--r-- | host/rootfs/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/host/initramfs/default.nix b/host/initramfs/default.nix index d03467d..a4f7330 100644 --- a/host/initramfs/default.nix +++ b/host/initramfs/default.nix @@ -6,8 +6,8 @@ }: pkgs.callPackage ( -{ lib, stdenv, makeModulesClosure, runCommand, writeReferencesToFile, pkgsStatic -, busybox, cpio, cryptsetup, lvm2, microcodeAmd, microcodeIntel +{ lib, stdenvNoCC, makeModulesClosure, runCommand, writeReferencesToFile +, pkgsStatic, busybox, cpio, cryptsetup, lvm2, microcodeAmd, microcodeIntel }: let @@ -58,7 +58,7 @@ let cp ${pkgsStatic.util-linuxMinimal}/bin/{findfs,lsblk} $out/bin ''; - microcode = if stdenv.hostPlatform.isx86_64 then + microcode = if stdenvNoCC.hostPlatform.isx86_64 then runCommand "microcode.cpio" { nativeBuildInputs = [ cpio ]; } '' @@ -78,7 +78,7 @@ let ''; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "initramfs"; src = cleanSourceWith { diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 7f5cedd..a9d52ee 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -3,7 +3,7 @@ { pkgs ? import <nixpkgs> {} }: pkgs.pkgsStatic.callPackage ( -{ lib, stdenv, nixos, runCommand, writeReferencesToFile, s6-rc, tar2ext4 +{ lib, stdenvNoCC, nixos, runCommand, writeReferencesToFile, s6-rc, tar2ext4 , busybox, cloud-hypervisor, cryptsetup, execline, jq, kmod , mdevd, s6, s6-linux-init, socat, util-linuxMinimal, xorg }: @@ -84,7 +84,7 @@ let ''; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "spectrum-rootfs"; src = cleanSourceWith { |