From 8f7c9816aaf7cc4347c3aa1cec916f20d2622fc7 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Thu, 10 Feb 2022 12:23:25 -0800
Subject: [PATCH] binutils: sort configureFlags

---
 .../tools/misc/binutils/default.nix           | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index b86237b84e69..4fc5ae6dc151 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -122,11 +122,7 @@ stdenv.mkDerivation {
 
   configurePlatforms = [ "build" "host" "target" ];
 
-  configureFlags =
-    (if enableShared then [ "--enable-shared" "--disable-static" ]
-                     else [ "--disable-shared" "--enable-static" ])
-  ++ lib.optional withAllTargets "--enable-targets=all"
-  ++ [
+  configureFlags = [
     "--enable-64-bit-bfd"
     "--with-system-zlib"
 
@@ -147,12 +143,15 @@ stdenv.mkDerivation {
     # for us to do is not leave it to chance, and force the program prefix to be
     # what we want it to be.
     "--program-prefix=${targetPrefix}"
-  ] ++ lib.optionals enableGold [
-    "--enable-gold"
-    "--enable-plugins"
-  ];
+  ] ++ lib.optionals withAllTargets [ "--enable-targets=all" ]
+    ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ]
+    ++ (if enableShared
+        then [ "--enable-shared" "--disable-static" ]
+        else [ "--disable-shared" "--enable-static" ]
+       );
 
-  doCheck = false; # fails
+  # Fails
+  doCheck = false;
 
   postFixup = lib.optionalString (enableShared && withAllTargets) ''
     rm "$out"/lib/lib{bfd,opcodes}-${version}.so