Merge master into staging-next

2021-01-12 18:47:24 +00:00
parent f1bb6c74f9 e350b35cce
commit f47a1ddfe4
284 changed files with 4202 additions and 2854 deletions
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  postPatch = "patchShebangs --host strace-graph";

-  configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";
+  configureFlags = [ "--enable-mpers=check" ];

  meta = with stdenv.lib; {
    homepage = "https://strace.io/";