ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-30 23:34:12 +03:00
Code Issues Projects Releases Wiki Activity

grub needs coreutils (for df and uniq)

Browse Source 
svn path=/nixpkgs/trunk/; revision=6062
This commit is contained in:
Armijn Hemel 2006-08-06 23:53:48 +00:00
parent e7bf53481a
commit e0758ef36a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/misc/grub-wrapper/builder.sh
View File

@ -2,4 +2,4 @@ source $stdenv/setup
source $makeWrapper source $makeWrapper
makeWrapper "$grub/sbin/grub-install" "$out/sbin/grub-install" \ 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"

4
pkgs/tools/misc/grub-wrapper/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, grub, diffutils, gnused, gnugrep}: {stdenv, grub, diffutils, gnused, gnugrep, coreutils}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = grub.name; name = grub.name;
@ -6,5 +6,5 @@ stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
inherit grub diffutils gnused gnugrep; inherit grub diffutils gnused gnugrep coreutils;
} }

4
pkgs/top-level/all-packages.nix
View File

@ -123,7 +123,7 @@ rec {
}; };
grubWrapper = (import ../tools/misc/grub-wrapper) { grubWrapper = (import ../tools/misc/grub-wrapper) {
inherit stdenv grub diffutils gnused gnugrep; inherit stdenv grub diffutils gnused gnugrep coreutils;
}; };
man = (import ../tools/misc/man) { man = (import ../tools/misc/man) {
@ -2567,8 +2567,6 @@ rec {
busybox = (import ../misc/busybox) { busybox = (import ../misc/busybox) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
gccCross = gcc40mips;
binutilsCross = binutilsMips;
}; };
saneBackends = (import ../misc/sane-backends) { saneBackends = (import ../misc/sane-backends) {