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

Merge pull request #100078 from mdevlamynck/fix-grub-kbdcomp

Browse Source 
grub2: fix grub-kbdcomp
This commit is contained in:
Sandro 2021-02-17 21:08:27 +01:00 committed by GitHub
commit b62f1a10ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,12 @@
{ 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
, fuse # only needed for grub-mount , fuse # only needed for grub-mount
, runtimeShell
, zfs ? null , zfs ? null
, efiSupport ? false , efiSupport ? false
, zfsSupport ? false , zfsSupport ? false
, xenSupport ? false , xenSupport ? false
, kbdcompSupport ? false, ckbcomp
}: }:
with lib; with lib;
@ -53,6 +55,13 @@ stdenv.mkDerivation rec {
./fix-bash-completion.patch ./fix-bash-completion.patch
]; ];
postPatch = if kbdcompSupport then ''
sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@'
'' else ''
echo '#! ${runtimeShell}' > 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 ];
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ]
++ optional doCheck qemu ++ optional doCheck qemu