From 831cb4169ec0d7f6b6fb812e0f9ea7dae76a970c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 12 Apr 2018 14:21:47 -0500 Subject: [PATCH] Revert "arm-frc-linux-gnueabi-binutils: init at 2.28" This reverts commit 1d7a478c92e3ca3b952008e16cceafe4e831036b. --- .../default.nix | 50 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 52 deletions(-) delete mode 100755 pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix diff --git a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix deleted file mode 100755 index fff91c6f7f3..00000000000 --- a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{stdenv, fetchurl, glibc, bison, arm-frc-linux-gnueabi-eglibc}: - -stdenv.mkDerivation rec { - _target = "arm-frc-linux-gnueabi"; - - version = "2.28"; - name = "${_target}-binutils-${version}"; - - src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88"; - }; - - nativeBuildInputs = [ bison arm-frc-linux-gnueabi-eglibc ]; - buildInputs = [ glibc ]; - - configureFlags = '' - --target=${_target} - --with-pkgversion='GNU-Binutils-for-FRC' - --with-sysroot=$out/${_target} - --with-build-sysroot=/$out/${_target} - --disable-multilib - --disable-nls - --enable-lto - --disable-libiberty-install - --enable-ld - --enable-gold=default - --enable-plugins - ''; - - postConfigure = '' - make configure-host - ''; - - postInstall = '' - rm -rf $out/share/info - ''; - - meta = { - description = "FRC binutils"; - longDescription = '' - binutils used to build arm-frc-linux-gnueabi and user programs. - ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.colescott ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # since 2017-09-10 - priority = 3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4be3e4edace..bd2b7cbe41f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -529,8 +529,6 @@ with pkgs; arm-frc-linux-gnueabi-linux-api-headers = callPackage ../development/libraries/arm-frc-linux-gnueabi-linux-api-headers {}; - arm-frc-linux-gnueabi-binutils = callPackage ../development/tools/misc/arm-frc-linux-gnueabi-binutils {}; - arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {})