diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 014eb72dd92..21d03b19c5a 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, noSysDirs}: stdenv.mkDerivation { - name = "binutils-2.14"; + name = "binutils-2.15"; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.nl.net/pub/gnu/binutils/binutils-2.14.tar.bz2; - md5 = "2da8def15d28af3ec6af0982709ae90a"; + url = http://ftp.gnu.org/gnu/binutils/binutils-2.15.tar.bz2; + md5 = "624e6b74983ac6b2960edaf2d522ca58"; }; + patches = [./no-lex.patch]; inherit noSysDirs; } diff --git a/pkgs/development/tools/misc/binutils/no-lex.patch b/pkgs/development/tools/misc/binutils/no-lex.patch new file mode 100644 index 00000000000..face7299a0c --- /dev/null +++ b/pkgs/development/tools/misc/binutils/no-lex.patch @@ -0,0 +1,20 @@ +diff -rc binutils-orig/ld/configure binutils-2.15/ld/configure +*** binutils-orig/ld/configure 2003-04-24 14:36:07.000000000 +0200 +--- binutils-2.15/ld/configure 2004-09-18 15:18:52.000000000 +0200 +*************** +*** 4414,4420 **** + + test -n "$LEX" && break + done +! test -n "$LEX" || LEX=""$missing_dir/missing flex"" + + # Extract the first word of "flex", so it can be a program name with args. + set dummy flex; ac_word=$2 +--- 4414,4420 ---- + + test -n "$LEX" && break + done +! test -n "$LEX" || LEX="$missing_dir/missing flex" + + # Extract the first word of "flex", so it can be a program name with args. + set dummy flex; ac_word=$2