Fixing the busybox installation. All symlinks were pointing wrong.

svn path=/nixpkgs/trunk/; revision=31191
This commit is contained in:
Lluís Batlle i Rossell 2012-01-01 20:14:50 +00:00
parent 076977b462
commit be12dae1ec

View File

@ -29,7 +29,7 @@ let
nixConfig = '' nixConfig = ''
CONFIG_PREFIX "$out" CONFIG_PREFIX "$out"
CONFIG_INSTALL_NO_USR n CONFIG_INSTALL_NO_USR y
''; '';
staticConfig = (if enableStatic then '' staticConfig = (if enableStatic then ''
@ -58,12 +58,6 @@ stdenv.mkDerivation rec {
make oldconfig make oldconfig
''; '';
postInstall = ''
mv -v $out/usr/bin/* $out/bin
mv -v $out/usr/sbin/* $out/sbin
rm -fRv $out/usr/
'';
crossAttrs = { crossAttrs = {
extraCrossConfig = '' extraCrossConfig = ''
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"