aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nix/busybox.nix4
-rw-r--r--nix/initramfs.nix2
2 files changed, 3 insertions, 3 deletions
diff --git a/nix/busybox.nix b/nix/busybox.nix
index 711a9d5..f78ebeb 100644
--- a/nix/busybox.nix
+++ b/nix/busybox.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "busybox-yerba";
src = fetchgit {
url = "https://git.eaguru.guru/mirrors/busybox.git"; # change this to the official git.busybox.net/busybox when their SSL comes back
- rev = "1_36_stable";
+ rev = "1_36_1";
hash = "sha256-lK8jlq1g2X9AhscZDiPf43koNbdMFYiLSAb9Y/OETnU=";
};
preConfigure = ''
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
make -j$NIX_BUILD_CORES all
'';
installPhase = ''
- make install CONFIG_PREFIX=$out
+ make install CONFIG_PREFIX=$out/_install
'';
}
diff --git a/nix/initramfs.nix b/nix/initramfs.nix
index 48039df..db2b313 100644
--- a/nix/initramfs.nix
+++ b/nix/initramfs.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
buildPhase = ''
mkdir -p $out
mkdir -p initramfs/bin
- cp -a ${busybox}/bin/* initramfs/bin/
+ cp -a ${busybox}/_install/* initramfs/
cp ${../initramfs_init} initramfs/init
chmod +x initramfs/init
cd initramfs