I revert my changes to get nixpkgs working on armv5tel-linux.

I thought I didn't change stdenv, but I did. This will go soon into the stdenv
branch then.
Reverse-merging r16467 through r16465.


svn path=/nixpkgs/trunk/; revision=16468

1 files changed, 5 insertions, 10 deletions

diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl-5.10/default.nix
index e7b6af563d6f..a8b8dd536a75 100644
--- a/pkgs/development/interpreters/perl-5.10/default.nix
+++ b/pkgs/development/interpreters/perl-5.10/default.nix
@@ -1,12 +1,5 @@
 {stdenv, fetchurl}:
 
-let
-  preBuildNoNative = ''
-      # Make Cwd work on NixOS (where we don't have a /bin/pwd).
-      substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
-    '';
-  preBuildNative = "";
-in
 stdenv.mkDerivation {
   name = "perl-5.10.0";
 
@@ -29,10 +22,8 @@ stdenv.mkDerivation {
   # "installstyle" option to ensure that modules are put under
   # $out/lib/perl5 - this is the general default, but because $out
   # contains the string "perl", Configure would select $out/lib.
-  # Miniperl needs -lm. perl needs -lrt.
   configureFlags = ''
     -de -Dcc=gcc -Uinstallusrbinperl -Dinstallstyle=lib/perl5 -Duseshrplib
-    -Dldflags='-lm -lrt'
     ${if stdenv ? glibc then "-Dusethreads" else ""}
   '';
 
@@ -50,7 +41,11 @@ stdenv.mkDerivation {
       fi
     '';
 
-  preBuild = if (stdenv.gcc.nativeTools) then preBuildNative else preBuildNoNative;
+  preBuild =
+    ''
+      # Make Cwd work on NixOS (where we don't have a /bin/pwd).
+      substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
+    '';
 
   setupHook = ./setup-hook.sh;
 }