Merge remote-tracking branch 'origin/stdenv-updates' into illumos

Conflicts: pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/mpc/default.nix pkgs/development/libraries/mpfr/default.nix pkgs/development/libraries/ppl/default.nix pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
parent 242b4d23a7 3c472d53aa
commit d007a78ccb
388 changed files with 6760 additions and 2009 deletions
@@ -23,6 +23,13 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  crossAttrs = {
+    # Disable stripping to avoid "libgmp.a: Archive has no index"
+    # (see <http://hydra.nixos.org/build/4268666>.)
+    dontStrip = true;
+    dontCrossStrip = true;
+  };
+
  meta = {
    description = "GMP, the GNU multiple precision arithmetic library";