diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-02 13:43:54 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-02 13:43:54 +0000 |
| commit | 455d1e934b9b66078290ad4cc74fb6b0976e4e42 (patch) | |
| tree | 0744e0ad975d670b9266790c1f24c874bc1c6316 /pkgs/misc | |
| parent | 14adc7a40ef639deca5672551c894fbae6bca72f (diff) | |
| parent | 15ab248bca6518e0a7e109e3276141c43f68ea99 (diff) | |
| download | nixlib-455d1e934b9b66078290ad4cc74fb6b0976e4e42.tar nixlib-455d1e934b9b66078290ad4cc74fb6b0976e4e42.tar.gz nixlib-455d1e934b9b66078290ad4cc74fb6b0976e4e42.tar.bz2 nixlib-455d1e934b9b66078290ad4cc74fb6b0976e4e42.tar.lz nixlib-455d1e934b9b66078290ad4cc74fb6b0976e4e42.tar.xz nixlib-455d1e934b9b66078290ad4cc74fb6b0976e4e42.tar.zst nixlib-455d1e934b9b66078290ad4cc74fb6b0976e4e42.zip | |
Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31205
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/busybox/default.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/misc/busybox/default.nix b/pkgs/misc/busybox/default.nix index f3a73514ed85..6ca30ddd96ba 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}-" |