diff --git a/flake.nix b/flake.nix
index 3156aba..74e1542 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,7 @@
       # ==== rustPlatform / gnutoolchain
         gnu-platform = "arm-none-eabi";
 
-        binutils-pkg = { extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec {
+        binutils-pkg = { zlib, extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec {
           basename = "binutils";
           version = "2.30";
           name = "${basename}-${gnu-platform}-${version}";
@@ -47,7 +47,7 @@
           ] ++ extraConfigureFlags;
           outputs = [ "out" "info" "man" ];
           depsBuildBuild = [ pkgs.buildPackages.stdenv.cc ];
-          buildInputs = [ pkgs.lib.zlib ];
+          buildInputs = [ zlib ];
           enableParallelBuilding = true;
           meta = {
             description = "Tools for manipulating binaries (linker, assembler, etc.)";
@@ -65,7 +65,7 @@
           };
         };
 
-        gcc-pkg = { platform-binutils, extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec {
+        gcc-pkg = { gmp, mpfr, libmpc, platform-binutils, extraConfigureFlags ? [] }: pkgs.stdenv.mkDerivation rec {
           basename = "gcc";
           version = "9.1.0";
           name = "${basename}-${gnu-platform}-${version}";
@@ -90,7 +90,7 @@
             "--with-ld=${platform-binutils}/bin/${gnu-platform}-ld" ] ++ extraConfigureFlags;
           outputs = [ "out" "info" "man" ];
           hardeningDisable = [ "format" "pie" ];
-          propagatedBuildInputs = with pkgs.libs; [ gmp mpfr libmpc platform-binutils ];
+          propagatedBuildInputs = [ gmp mpfr libmpc platform-binutils ];
           enableParallelBuilding = true;
           dontFixup = true;
         };
@@ -102,7 +102,7 @@
             url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
             sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv";
           };
-          nativeBuildInputs = [ platform-binutils pkgs.platform-gcc ];
+          nativeBuildInputs = [ platform-binutils platform-gcc ];
           configureFlags = [
             "--target=${gnu-platform}"
 
@@ -151,7 +151,7 @@
           sha256 = "18djvygq9v8rmfchvi2hfj0i6fhn36m716vqndqnj56fiqviwxvf";
         };
         cargoSha256 = "13sj9j9kl6js75h9xq0yidxy63vixxm9q3f8jil6ymarml5wkhx8";
-        
+
         meta = with pkgs.lib; {
           description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
           homepage = "https://github.com/rust-osdev/cargo-xbuild";
diff --git a/nix/fsbl.patch b/fsbl.patch
similarity index 100%
rename from nix/fsbl.patch
rename to fsbl.patch