From be12dae1ec4c124571d4c18fb20696e6b9e924a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 1 Jan 2012 20:14:50 +0000 Subject: [PATCH] Fixing the busybox installation. All symlinks were pointing wrong. svn path=/nixpkgs/trunk/; revision=31191 --- pkgs/misc/busybox/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index f3a73514ed8..6ca30ddd96b 100644 --- a/pkgs/misc/busybox/default.nix +++ b/pkgs/misc/busybox/default.nix @@ -29,7 +29,7 @@ let nixConfig = '' CONFIG_PREFIX "$out" - CONFIG_INSTALL_NO_USR n + CONFIG_INSTALL_NO_USR y ''; staticConfig = (if enableStatic then '' @@ -58,12 +58,6 @@ stdenv.mkDerivation rec { make oldconfig ''; - postInstall = '' - mv -v $out/usr/bin/* $out/bin - mv -v $out/usr/sbin/* $out/sbin - rm -fRv $out/usr/ - ''; - crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"