about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-09 16:43:26 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-09 22:31:34 -0400
commitdc051dfdef1ec4c9bdd90b228764b6c24372597e (patch)
tree290013079eb904bf3d881b59687cf80b17f506a9
parent41ad32febea7e0f661fe77a48a8cbc03baac6123 (diff)
downloadnixlib-dc051dfdef1ec4c9bdd90b228764b6c24372597e.tar
nixlib-dc051dfdef1ec4c9bdd90b228764b6c24372597e.tar.gz
nixlib-dc051dfdef1ec4c9bdd90b228764b6c24372597e.tar.bz2
nixlib-dc051dfdef1ec4c9bdd90b228764b6c24372597e.tar.lz
nixlib-dc051dfdef1ec4c9bdd90b228764b6c24372597e.tar.xz
nixlib-dc051dfdef1ec4c9bdd90b228764b6c24372597e.tar.zst
nixlib-dc051dfdef1ec4c9bdd90b228764b6c24372597e.zip
kexectools: fix build on i686
https://hydra.nixos.org/build/99957229
See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
-rw-r--r--pkgs/os-specific/linux/kexectools/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 3d3215e6b4bf..4e9007c73625 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, zlib }:
+{ stdenv, buildPackages, fetchurl, zlib, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "kexec-tools";
@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
 
+  patches = [
+    # fix build on i686
+    # See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
+    (fetchpatch {
+      name = "kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
+      url = "https://src.fedoraproject.org/rpms/kexec-tools/raw/cb1e5463b5298b064e9b6c86ad6fe3505fec9298/f/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch";
+      sha256 = "1kzmcsbhwfdgxlc5s88ir0n494phww1j16yk0z42x09qlkxxkg0l";
+    })
+  ];
+
   meta = with stdenv.lib; {
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";