From 48389f4179c734b412587f8d9da620688ff20d35 Mon Sep 17 00:00:00 2001
From: Baitinq <manuelpalenzuelamerino@gmail.com>
Date: Wed, 5 Oct 2022 11:29:34 +0200
Subject: [PATCH] Toolchain: serenity.nix: Fix fuse2fs not being installed

Nix (nixpkgs) have updated a while back how the e2fsprogs derivation
works and now fuse2fs wasnt being installed with it. It is now needed to
add a new derivation (package) to the dependency list: "fuse2fs". This
fixes the Meta/serenity.sh script not finding the fuse2fs binary for
rootless image building :^)
---
 Toolchain/serenity.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Toolchain/serenity.nix b/Toolchain/serenity.nix
index 3f6cab72ed..900e3280c2 100644
--- a/Toolchain/serenity.nix
+++ b/Toolchain/serenity.nix
@@ -25,13 +25,10 @@ stdenv.mkDerivation {
     openssl
     xlibsWrapper
     qemu
-    # e2fsprogs needs some optional parameter to activate fuse2fs with which
-    # the qemu image will be mounted without root access.
-    (e2fsprogs.overrideAttrs (oldAttrs: {
-      buildInputs = oldAttrs.buildInputs ++ [ pkgs.fuse ];
-    }))
+    e2fsprogs
+    fuse2fs
     # glibc
   ];
-  
+
   hardeningDisable = [ "format" "fortify" ];
 }