summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/ed
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-12-04 17:12:35 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-12-04 17:12:35 +0100
commit5e256ccc88d10f2085d726f9c230df3ea15091e0 (patch)
tree3bb5adb173dad4bedb2a1c5a2193bbc7a06ba466 /pkgs/applications/editors/ed
parentc138356805fb23c029f7eadb8dab087d88230110 (diff)
parent50e7ddbdcafbda47de85af336d2aa96da904d5c1 (diff)
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/applications/editors/ed')
-rw-r--r--pkgs/applications/editors/ed/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index aa1a5b91a820..9814b2138c3f 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -8,7 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "0rcay0wci2kiwil2h505b674cblmn4nq8pqw9g9pgqmaqjq6f711";
};
- doCheck = true;
+ /* FIXME: Tests currently fail on Darwin:
+
+ building test scripts for ed-1.5...
+ testing ed-1.5...
+ *** Output e1.o of script e1.ed is incorrect ***
+ *** Output r3.o of script r3.ed is incorrect ***
+ make: *** [check] Error 127
+
+ */
+ doCheck = !stdenv.isDarwin;
crossAttrs = {
compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];