From ddc055658dc43229036c3daa00ac2121efffc748 Mon Sep 17 00:00:00 2001 From: shibedrill Date: Fri, 7 Mar 2025 18:25:34 -0500 Subject: [PATCH] touch-ups --- README.md | 2 +- shell.nix | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b5b2137..c444266 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ To change the search path for limine's binaries, supply `LIMINEDIR=/some/valid/p If you use Nix, you can install all these dependencies automatically by running `nix-shell`. This will also automatically set the correct directory for the limine BIOS files. > [!IMPORTANT] -> **I do not, and cannot, currently recommend using `nix` for dependency management.** `nixpkgs` ships an outdated version of Limine which is incompatible and contains none of the necessary files. +> **I do not, and cannot, currently recommend using `nix` for dependency management.** `nixpkgs` does not ship all of the necessary files in its packaging of limine. ## Kernel Parameters diff --git a/shell.nix b/shell.nix index 8d5bfa8..0466a10 100644 --- a/shell.nix +++ b/shell.nix @@ -1,22 +1,21 @@ let - - nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/25.05-pre"; - + nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz"; pkgs = import nixpkgs { config = {}; overlays = []; }; - in pkgs.mkShell { packages = with pkgs; [ - bash - limine.dev + limine.lib xorriso rustup qemu gnumake + ]; + buildInputs = with pkgs; [ + limine.lib ]; shellHook = ''