Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  depsBuildBuild = [ buildPackages.stdenv.cc ];
  buildInputs = [ zlib ];

-  patches = stdenv.lib.optionals stdenv.hostPlatform.isi686 [
+  patches = [
    # fix build on i686
    # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
    (fetchpatch {