mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
grub needs coreutils (for df and uniq)
svn path=/nixpkgs/trunk/; revision=6062
This commit is contained in:
parent
e7bf53481a
commit
e0758ef36a
@ -2,4 +2,4 @@ source $stdenv/setup
|
||||
source $makeWrapper
|
||||
|
||||
makeWrapper "$grub/sbin/grub-install" "$out/sbin/grub-install" \
|
||||
--suffix-each PATH ':' "$diffutils/bin $gnused/bin $gnugrep/bin"
|
||||
--suffix-each PATH ':' "$diffutils/bin $gnused/bin $gnugrep/bin $coreutils/bin"
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, grub, diffutils, gnused, gnugrep}:
|
||||
{stdenv, grub, diffutils, gnused, gnugrep, coreutils}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = grub.name;
|
||||
@ -6,5 +6,5 @@ stdenv.mkDerivation {
|
||||
builder = ./builder.sh;
|
||||
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
|
||||
|
||||
inherit grub diffutils gnused gnugrep;
|
||||
inherit grub diffutils gnused gnugrep coreutils;
|
||||
}
|
||||
|
@ -123,7 +123,7 @@ rec {
|
||||
};
|
||||
|
||||
grubWrapper = (import ../tools/misc/grub-wrapper) {
|
||||
inherit stdenv grub diffutils gnused gnugrep;
|
||||
inherit stdenv grub diffutils gnused gnugrep coreutils;
|
||||
};
|
||||
|
||||
man = (import ../tools/misc/man) {
|
||||
@ -2567,8 +2567,6 @@ rec {
|
||||
|
||||
busybox = (import ../misc/busybox) {
|
||||
inherit fetchurl stdenv;
|
||||
gccCross = gcc40mips;
|
||||
binutilsCross = binutilsMips;
|
||||
};
|
||||
|
||||
saneBackends = (import ../misc/sane-backends) {
|
||||
|
Loading…
Reference in New Issue
Block a user