diff --git a/.gitignore b/.gitignore index 6833589..08acf41 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,6 @@ .task /result /target -/out -/initrd.gz .*.swp .*.swo .nixos-test-history diff --git a/flake.nix b/flake.nix index b8d7461..fcb6233 100644 --- a/flake.nix +++ b/flake.nix @@ -32,8 +32,6 @@ kernel = pkgs.callPackage ./kernel { }; glibc = pkgs.callPackage ./glibc { }; - systemd = pkgs.callPackage ./systemd { }; - mkinitrd = pkgs.writeShellScriptBin "mkinitrd" '' echo "make initrd..." mkdir -p out @@ -115,7 +113,7 @@ chmod 644 ./etc/group # get shared libs - find . -type f -executable | xargs ldd 2> /dev/null | awk '{print $3}' | grep -v systemd | sort -u | xargs cp -t usr/lib + find . -type f -executable | xargs ldd | awk '{print $3}' | grep -v systemd | sort -u | xargs cp -t usr/lib find . -type f -executable | xargs chmod 755 # FIXME: hacky patch elf patching. Is there a better way???????? @@ -127,6 +125,7 @@ # gen initrd find . -print0 | ${pkgs.lib.getExe pkgs.cpio} --null --owner=root:root -o --format=newc | ${pkgs.lib.getExe pkgs.gzip} -9 > ../initrd.gz ''; + systemd = pkgs.callPackage ./systemd { }; }; checks = {