From 43182285fdaec76d75c35e7c101b08d3c1adad6a Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 2 Jun 2023 17:24:26 +0200 Subject: [PATCH] Toolchain: Sort packages in {nativeB,b}uildInputs nix lists --- Toolchain/serenity.nix | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Toolchain/serenity.nix b/Toolchain/serenity.nix index 311825b5b1..19546f3396 100644 --- a/Toolchain/serenity.nix +++ b/Toolchain/serenity.nix @@ -4,34 +4,35 @@ with pkgs; stdenv.mkDerivation { name = "cpp-env"; nativeBuildInputs = [ - gcc12 - curl + ccache cmake - mpfr - ninja - gmp - libmpc + curl e2fsprogs fuse2fs - patch - ccache - rsync - unzip - texinfo - pkg-config + gcc12 + gmp # To create port launcher icons imagemagick + libmpc + mpfr + ninja + patch + pkg-config + rsync + texinfo + unzip ]; + buildInputs = [ - openssl - libxcrypt - xlibsWrapper - qemu e2fsprogs fuse2fs # To build the GRUB disk image grub2 + libxcrypt + openssl parted + qemu + xlibsWrapper ]; hardeningDisable = [ "format" "fortify" ];