diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
commit | de419917a3bd72c7b60632bd77eff1201c546050 (patch) | |
tree | 972321bd451a0aaffe30c78033ffb1f9fb9d7388 /pkgs/tools/misc/grub/default.nix | |
parent | 1df2560dde3df459dd0e71883c5eac014100b0b0 (diff) | |
parent | 9064d9db001472e544536daf5ef7381ff4913d82 (diff) | |
download | nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.gz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.bz2 nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.lz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.xz nixlib-de419917a3bd72c7b60632bd77eff1201c546050.tar.zst nixlib-de419917a3bd72c7b60632bd77eff1201c546050.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc/grub/default.nix')
-rw-r--r-- | pkgs/tools/misc/grub/default.nix | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 6ba931ad80d6..f5ba8b7fe100 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,52 +1,30 @@ {stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: +let +in stdenv.mkDerivation { - name = "grub-0.97-patch-1.12"; + name = "grub-0.97-73"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; - # Lots of patches from Gentoo, in particular splash screen support - # (not the fancy SUSE gfxmenu stuff though). Also a fix for boot - # failures on systems with more than 2 GiB RAM, and for booting from - # ext3 filesystems with 256-byte inodes as well as ext4 filesystems. - gentooPatches = fetchurl { - url = mirror://gentoo/distfiles/grub-0.97-patches-1.12.tar.bz2; - sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0"; - }; - patches = [ # Properly handle the case of symlinks such as # /dev/disk/by-label/bla. The symlink resolution code in # grub-install isn't smart enough. ./symlink.patch - - # Provide support for the "savedefault --once" command in the Grub - # shell. KDE uses this to allow rebooting into a non-default - # entry. - (fetchurl { - url = "https://raw.github.com/andatche/centos-grub/master/SOURCES/grub-0.97-once.patch"; - sha256 = "1g5qfn8lvl32h4pggdf7dmjqjpi42jblknzakb5h909fi5i1qyw8"; - }) - - ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); + ] + ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch) + ++ map fetchurl (import ./grub1.patches.nix) + ; # autoreconfHook required for the splashimage patch. nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ texinfo ]; - hardeningDisable = [ "stackprotector" ]; - - prePatch = '' - unpackFile $gentooPatches - rm patch/400_all_grub-0.97-reiser4-20050808-gentoo.patch - for i in patch/*.patch; do - echo "applying patch $i" - patch -p1 < $i || patch -p0 < $i - done - ''; + hardeningDisable = [ "format" "stackprotector" ]; passthru.grubTarget = ""; |