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
@@ -31,6 +31,9 @@ stdenv.mkDerivation {
         docbook_xsl docbook_xml_dtd_45 libxslt ]
    ++ stdenv.lib.optionals guiSupport [tcl tk];

+  # required to support pthread_cancel()
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+
  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "");