diff options
author | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
commit | f67d5a9a39c658ba38ce4efd3968fb76ed97ac70 (patch) | |
tree | fb0a753dab894f13519ea969ad7edcfc19e3b56f /pkgs/tools/misc/grub | |
parent | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (diff) | |
parent | 9ada368ef842d5bc52d0db0b92ee0217cc213a83 (diff) | |
download | nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.gz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.bz2 nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.lz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.xz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.zst nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.zip |
Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix
Diffstat (limited to 'pkgs/tools/misc/grub')
-rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/fix-bash-completion.patch | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index e85e8de3dd84..fae10a10a2ea 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; + patches = [ ./fix-bash-completion.patch ]; + configureFlags = let arch = if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" diff --git a/pkgs/tools/misc/grub/fix-bash-completion.patch b/pkgs/tools/misc/grub/fix-bash-completion.patch new file mode 100644 index 000000000000..97cecdce373f --- /dev/null +++ b/pkgs/tools/misc/grub/fix-bash-completion.patch @@ -0,0 +1,24 @@ +diff -ubr grub-2.00-orig/util/bash-completion.d/grub-completion.bash.in grub-2.00/util/bash-completion.d/grub-completion.bash.in +--- grub-2.00-orig/util/bash-completion.d/grub-completion.bash.in 2012-10-16 19:02:36.342733957 +0200 ++++ grub-2.00/util/bash-completion.d/grub-completion.bash.in 2012-10-16 19:04:48.262733941 +0200 +@@ -17,6 +17,12 @@ + # along with GRUB. If not, see <http://www.gnu.org/licenses/>. + # bash completion for grub + ++have() ++{ ++ unset -v have ++ _have $1 && have=yes ++} ++ + __grub_dir() { + local i c=1 boot_dir + +@@ -479,6 +485,7 @@ + have ${__grub_script_check_program} && \ + complete -F _grub_script_check -o filenames ${__grub_script_check_program} + ++unset -f have + + # Local variables: + # mode: shell-script |