From ba6ba67fa04d22759d0dc1e52e3994574b1aba5f Mon Sep 17 00:00:00 2001
From: jd <jean.daniel.michaud@gmail.com>
Date: Tue, 29 Mar 2022 22:08:03 +0200
Subject: [PATCH] Toolchain: Fix serenity.nix

* x11 package name has changed to xlibsWrapper.
* texinfo is necessary for Makeinfo.
* e2fsprogs was recenty fixed on nicpkgs to include fuse2fs to mount
serenity images without root access but it needed some configuration.
---
 Toolchain/serenity.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Toolchain/serenity.nix b/Toolchain/serenity.nix
index 3f70aab34f2..3f6cab72ed8 100644
--- a/Toolchain/serenity.nix
+++ b/Toolchain/serenity.nix
@@ -16,16 +16,22 @@ stdenv.mkDerivation {
     ccache
     rsync
     unzip
-
+    texinfo
     # Example Build-time Additional Dependencies
     pkgconfig
   ];
   buildInputs = [
     # Example Run-time Additional Dependencies
     openssl
-    x11
+    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 ];
+    }))
     # glibc
   ];
+  
   hardeningDisable = [ "format" "fortify" ];
 }