summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-12-08 10:22:31 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-12-08 10:22:31 +0100
commitcdde22aef5c126e4474f3ecb67c32507db5a3138 (patch)
tree6fd31f9ce404bacfd7f1f06e52e4567af7c08509 /pkgs/applications/editors
parent86ffdce8788757ef4fedcf726c73a80beba04b7d (diff)
parent9ab584833534cfb94e148b2c88ba932ead00bcdb (diff)
downloadnixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar
nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.gz
nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.bz2
nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.lz
nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.xz
nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.tar.zst
nixlib-cdde22aef5c126e4474f3ecb67c32507db5a3138.zip
Merge branch 'staging' (older one)
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/ed/default.nix20
1 files changed, 1 insertions, 19 deletions
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index ee5afe500efe..6c2f1ea2003c 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -11,27 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
   };
 
-  unpackCmd = "tar --lzip -xf";
-
   nativeBuildInputs = [ lzip ];
 
-  /* 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 = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
-
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  configureFlags = [
-    "--exec-prefix=${stdenv.cc.targetPrefix}"
-    "CC=${stdenv.cc.targetPrefix}cc"
-  ];
+  doCheck = hostPlatform == buildPlatform;
 
   meta = {
     description = "An implementation of the standard Unix editor";