Author: ludo Date: Mon Apr 23 16:28:06 2012 New Revision: 33896 URL: https://nixos.org/websvn/nix/?rev=33896&sc=1
Log: GCC 4.6: Don't bail out when `gnused' isn't provided. Modified: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix Modified: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix Mon Apr 23 15:47:41 2012 (r33895) +++ nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix Mon Apr 23 16:28:06 2012 (r33896) @@ -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 @@ # 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; _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
