public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112857 from r-burns/grub-cross

Browse Source 
grub2: fix cross-compilation
This commit is contained in:
Guillaume Girol 2021-02-18 11:57:46 +00:00 committed by GitHub
commit 5d7cecc090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/misc/grub/2.0x.nix
View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config
, pkgsBuildBuild
, nixosTests
, fuse # only needed for grub-mount , fuse # only needed for grub-mount
, runtimeShell , runtimeShell
, zfs ? null , zfs ? null
@ -62,11 +64,13 @@ stdenv.mkDerivation rec {
echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in
''; '';
nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext ];
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ]
++ optional doCheck qemu ++ optional doCheck qemu
++ optional zfsSupport zfs; ++ optional zfsSupport zfs;
strictDeps = true;
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
# Work around a bug in the generated flex lexer (upstream flex bug?) # Work around a bug in the generated flex lexer (upstream flex bug?)
@ -99,7 +103,10 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
''; '';
configureFlags = [ "--enable-grub-mount" ] # dep of os-prober configureFlags = [
"--enable-grub-mount" # dep of os-prober
"BUILD_CC=${pkgsBuildBuild.stdenv.cc}/bin/cc"
]
++ optional zfsSupport "--enable-libzfs" ++ optional zfsSupport "--enable-libzfs"
++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ]
++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"];
@ -119,6 +126,14 @@ stdenv.mkDerivation rec {
sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|"
''; '';
passthru.tests = {
nixos-grub = nixosTests.grub;
nixos-install-simple = nixosTests.installer.simple;
nixos-install-grub1 = nixosTests.installer.grub1;
nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub;
nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation;
};
meta = with lib; { meta = with lib; {
description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)";