diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/tools/misc/grub | |
parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) | |
download | nixpkgs-716aac2519a7571e7f5fd984a886d579a4a051c5.tar nixpkgs-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.gz nixpkgs-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.bz2 nixpkgs-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.lz nixpkgs-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.xz nixpkgs-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.zst nixpkgs-716aac2519a7571e7f5fd984a886d579a4a051c5.zip |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/tools/misc/grub')
-rw-r--r-- | pkgs/tools/misc/grub/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index cb561e8172f..d6534fc5ee6 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, texinfo, buggyBiosCDSupport ? true}: +{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: stdenv.mkDerivation { name = "grub-0.97-patch-1.12"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); - # Autoconf/automake required for the splashimage patch. - buildInputs = [autoconf automake texinfo]; + # autoreconfHook required for the splashimage patch. + buildInputs = [ autoreconfHook texinfo ]; prePatch = '' unpackFile $gentooPatches @@ -45,11 +45,6 @@ stdenv.mkDerivation { done ''; - preConfigure = '' - autoreconf - automake --add-missing - ''; - passthru.grubTarget = ""; meta = { |