Merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=31205
2012-01-02 13:43:54 +00:00
parent 14adc7a40e 15ab248bca
commit 455d1e934b
165 changed files with 2060 additions and 1206 deletions
@@ -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}-"