From b53f6b9dd02573090dee8538ab7e88848759882f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 23 Apr 2012 16:28:06 +0000 Subject: [PATCH] GCC 4.6: Don't bail out when `gnused' isn't provided. svn path=/nixpkgs/trunk/; revision=33896 --- pkgs/development/compilers/gcc/4.6/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index f1e4991f6c1..3955455df4c 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -28,7 +28,7 @@ , gnat ? null , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true -, gnused +, gnused ? null }: assert langJava -> zip != null && unzip != null @@ -40,6 +40,9 @@ assert langVhdl -> gnat != null; # LTO needs libelf and zlib. assert libelf != null -> zlib != null; +# Make sure we get GNU sed. +assert stdenv.isDarwin -> gnused != null; + with stdenv.lib; with builtins;