Ver código fonte

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.
jd 3 anos atrás
pai
commit
ba6ba67fa0
1 arquivos alterados com 8 adições e 2 exclusões
  1. 8 2
      Toolchain/serenity.nix

+ 8 - 2
Toolchain/serenity.nix

@@ -16,16 +16,22 @@ stdenv.mkDerivation {
     ccache
     ccache
     rsync
     rsync
     unzip
     unzip
-
+    texinfo
     # Example Build-time Additional Dependencies
     # Example Build-time Additional Dependencies
     pkgconfig
     pkgconfig
   ];
   ];
   buildInputs = [
   buildInputs = [
     # Example Run-time Additional Dependencies
     # Example Run-time Additional Dependencies
     openssl
     openssl
-    x11
+    xlibsWrapper
     qemu
     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
     # glibc
   ];
   ];
+  
   hardeningDisable = [ "format" "fortify" ];
   hardeningDisable = [ "format" "fortify" ];
 }
 }