Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 41ad32febea7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc051dfdef1e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 10, 2019

  1. kexectools: fix build on i686 

    https://hydra.nixos.org/build/99957229
See: https://src.fedoraproject.org/rpms/kexec-tools/c/cb1e5463b5298b064e9b6c86ad6fe3505fec9298
    @worldofpeace
    worldofpeace committed Sep 10, 2019
    Copy the full SHA
    dc051df View commit details
Showing with 11 additions and 1 deletion.
  1. +11 −1 pkgs/os-specific/linux/kexectools/default.nix
12 changes: 11 additions & 1 deletion pkgs/os-specific/linux/kexectools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";