diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index 1354fddf50a9..52719f68aa85 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -263,6 +263,8 @@ stdenv.mkDerivation { isGNU = true; }; + __structuredAttrs = true; + meta = { description = "Tools for manipulating binaries (linker, assembler, etc.)"; longDescription = '' diff --git a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix index 1566b212bd36..ee14b2560616 100644 --- a/pkgs/development/tools/misc/binutils/2.38/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/2.38/libbfd.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + __structuredAttrs = true; + meta = { description = "Library for manipulating containers of machine code"; longDescription = '' diff --git a/pkgs/development/tools/misc/binutils/2.38/libopcodes.nix b/pkgs/development/tools/misc/binutils/2.38/libopcodes.nix index b6cbfaabd66d..d268a5a1100c 100644 --- a/pkgs/development/tools/misc/binutils/2.38/libopcodes.nix +++ b/pkgs/development/tools/misc/binutils/2.38/libopcodes.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + __structuredAttrs = true; + meta = { description = "Library from binutils for manipulating machine code"; homepage = "https://www.gnu.org/software/binutils/"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 05f863742d31..60ee7b916d5f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -278,7 +278,7 @@ stdenv.mkDerivation (finalAttrs: { for target in ${lib.escapeShellArgs allGasTargets}; do mkdir "$NIX_BUILD_TOP/build-$target" env -C "$NIX_BUILD_TOP/build-$target" \ - "$configureScript" $configureFlags "''${configureFlagsArray[@]}" \ + "$configureScript" "''${configureFlags[@]}" \ --enable-gas --program-prefix "$target-" --target "$target" done ''; @@ -293,7 +293,7 @@ stdenv.mkDerivation (finalAttrs: { postBuild = lib.optionalString withAllTargets '' for target in ${lib.escapeShellArgs allGasTargets}; do make -C "$NIX_BUILD_TOP/build-$target" -j"$NIX_BUILD_CORES" \ - $makeFlags "''${makeFlagsArray[@]}" $buildFlags "''${buildFlagsArray[@]}" \ + "''${makeFlags[@]}" "''${buildFlags[@]}" \ TARGET-gas=as-new all-gas done ''; @@ -328,7 +328,7 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString withAllTargets '' for target in ${lib.escapeShellArgs allGasTargets}; do make -C "$NIX_BUILD_TOP/build-$target/gas" -j"$NIX_BUILD_CORES" \ - $makeFlags "''${makeFlagsArray[@]}" $installFlags "''${installFlagsArray[@]}" \ + "''${makeFlags[@]}" "''${installFlags[@]}" \ install-exec-bindir done '' @@ -354,6 +354,8 @@ stdenv.mkDerivation (finalAttrs: { ''; }; + __structuredAttrs = true; + meta = { description = "Tools for manipulating binaries (linker, assembler, etc.)"; longDescription = '' diff --git a/pkgs/development/tools/misc/binutils/libbfd.nix b/pkgs/development/tools/misc/binutils/libbfd.nix index 443c90ef83c8..dcaa6e749280 100644 --- a/pkgs/development/tools/misc/binutils/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/libbfd.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { inherit (binutils-unwrapped-all-targets) src dev plugin-api-header; }; + __structuredAttrs = true; + meta = { description = "Library for manipulating containers of machine code"; longDescription = '' diff --git a/pkgs/development/tools/misc/binutils/libopcodes.nix b/pkgs/development/tools/misc/binutils/libopcodes.nix index 496dc83620f1..81c16b78cdc8 100644 --- a/pkgs/development/tools/misc/binutils/libopcodes.nix +++ b/pkgs/development/tools/misc/binutils/libopcodes.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { inherit (binutils-unwrapped-all-targets) dev; }; + __structuredAttrs = true; + meta = { description = "Library from binutils for manipulating machine code"; homepage = "https://www.gnu.org/software/binutils/";