Merge from trunk up through r28790

svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
parent 5d62c65d6e b58016b007
commit 4d70ba6cc9
2168 changed files with 42927 additions and 19027 deletions
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, ncurses }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
  name = "readline-6.2";

  src = fetchurl {
@@ -48,3 +48,10 @@ stdenv.mkDerivation rec {
    maintainers = [ stdenv.lib.maintainers.ludo ];
  };
 }
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))