Merge staging into staging-next

2019-09-29 11:05:22 +02:00
parent 9b09b832fc 52af1d0930
commit 503081fa5b
219 changed files with 3102 additions and 2180 deletions
@@ -8,15 +8,13 @@ stdenv.mkDerivation rec {
    sha256 = "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21";
  };

-  # Perl is needed for `cg_annotate'.
-  nativeBuildInputs = [ perl ];
-
  outputs = [ "out" "dev" "man" "doc" ];

  hardeningDisable = [ "stackprotector" ];

  # GDB is needed to provide a sane default for `--db-command'.
-  buildInputs = [ gdb ]  ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
+  # Perl is needed for `callgrind_{annotate,control}'.
+  buildInputs = [ gdb perl ]  ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];

  enableParallelBuilding = true;
  separateDebugInfo = stdenv.isLinux;