alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request from anthonyroussel/efibootmgr_18

Browse source
This commit is contained in:
Sandro 2022-11-10 22:40:39 +01:00 committed by GitHub
parent 883420d94b 49d994ef5b
commit a08e39f99f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 53 deletions
pkgs/tools/system
efibootmgr
default.nix
efivar
default.nix

27
pkgs/tools/system/efibootmgr/default.nix
View file

@ -1,36 +1,31 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, efivar, popt }:
{ lib, stdenv, fetchFromGitHub, pkg-config, efivar, popt }:
stdenv.mkDerivation rec {
pname = "efibootmgr";
version = "17";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ efivar popt ];
version = "18";
src = fetchFromGitHub {
owner = "rhboot";
repo = "efibootmgr";
rev = version;
sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03";
hash = "sha256-DYYQGALEn2+mRHgqCJsA7OQCF7xirIgQlWexZ9uoKcg=";
};
patches = [
(fetchpatch {
name = "remove-extra-decl.patch";
url = "https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad.patch";
sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h";
})
];
nativeBuildInputs = [ pkg-config ];
makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ];
buildInputs = [ efivar popt ];
makeFlags = [
"EFIDIR=nixos"
"PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
];
installFlags = [ "prefix=$(out)" ];
meta = with lib; {
description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
homepage = "https://github.com/rhboot/efibootmgr";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};

42
pkgs/tools/system/efivar/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkg-config, popt }:
{ lib, stdenv, buildPackages, fetchFromGitHub, pkg-config, popt, mandoc }:
stdenv.mkDerivation rec {
pname = "efivar";
version = "37";
version = "38";
outputs = [ "bin" "out" "dev" "man" ];
@ -10,42 +10,10 @@ stdenv.mkDerivation rec {
owner = "rhinstaller";
repo = "efivar";
rev = version;
sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09";
hash = "sha256-A38BKGMK3Vo+85wzgxmzTjzZXtpcY9OpbZaONWnMYNk=";
};
patches = [
(fetchurl {
name = "r13y.patch";
url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch";
sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6";
})
(fetchurl {
name = "fix-misaligned-pointer.patch";
url = "https://github.com/rhboot/efivar/commit/b98ba8921010d03f46704a476c69861515deb1ca.patch";
sha256 = "0ni9mz7y40a2wf1d1q5n9y5dhcbydxvfdhqic7zsmgnaxs3a0p27";
})
(fetchurl {
name = "fix-gcc9-error.patch";
url = "https://github.com/rhboot/efivar/commit/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch";
sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky";
})
(fetchurl {
name = "remove_unused_variable.patch";
url = "https://github.com/rhboot/efivar/commit/fdb803402fb32fa6d020bac57a40c7efe4aabb7d.patch";
sha256 = "1xhy8v8ff9lyxb830n9hci2fbh7rfps6rwsqrjh4lw7316gwllsd";
})
(fetchurl {
name = "check_string_termination.patch";
url = "https://github.com/rhboot/efivar/commit/4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e.patch";
sha256 = "1ajj11wwsvamfspq4naanvw08h63gr0g71q0dfbrrywrhc0jlmdw";
})
];
NIX_CFLAGS_COMPILE = [
"-Wno-error=stringop-truncation"
"-flto-partition=none"
];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config mandoc ];
buildInputs = [ popt ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
@ -62,6 +30,6 @@ stdenv.mkDerivation rec {
inherit (src.meta) homepage;
description = "Tools and library to manipulate EFI variables";
platforms = platforms.linux;
license = licenses.lgpl21;
license = licenses.lgpl21Only;
};
}