From a865d17b7cd1599f6d0e5512147e15bbc75561ba Mon Sep 17 00:00:00 2001 From: Bert Moens Date: Mon, 4 Dec 2017 20:23:35 +0100 Subject: [PATCH 1/3] ed: fix docs location by removing installFlags and configureFlags. Fixes #32159 --- pkgs/applications/editors/ed/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index ee5afe500efe..1f6a9b89676d 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -26,13 +26,6 @@ stdenv.mkDerivation rec { */ doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform); - installFlags = [ "DESTDIR=$(out)" ]; - - configureFlags = [ - "--exec-prefix=${stdenv.cc.targetPrefix}" - "CC=${stdenv.cc.targetPrefix}cc" - ]; - meta = { description = "An implementation of the standard Unix editor"; From 0bb47027abfcbdb6a05c0a8a8eba265c4307bdaa Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 4 Dec 2017 19:08:11 +0000 Subject: [PATCH 2/3] lzip: add unpackCmd hook --- pkgs/applications/editors/ed/default.nix | 2 -- pkgs/tools/compression/lzip/default.nix | 3 +++ pkgs/tools/compression/lzip/lzip-setup-hook.sh | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/compression/lzip/lzip-setup-hook.sh diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 1f6a9b89676d..b611d3319d7a 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm"; }; - unpackCmd = "tar --lzip -xf"; - nativeBuildInputs = [ lzip ]; /* FIXME: Tests currently fail on Darwin: diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index cee23934d0ce..298e490be873 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; + setupHook = ./lzip-setup-hook.sh; + doCheck = true; + enableParallelBuilding = true; meta = { homepage = http://www.nongnu.org/lzip/lzip.html; diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/pkgs/tools/compression/lzip/lzip-setup-hook.sh new file mode 100644 index 000000000000..092ad7737dd1 --- /dev/null +++ b/pkgs/tools/compression/lzip/lzip-setup-hook.sh @@ -0,0 +1,5 @@ +lzipUnpackCmdHook() { + [[ "$1" = *.tar.lz ]] && tar --lzip -xf "$1" +} + +unpackCmdHooks+=(lzipUnpackCmdHook) From bb2b4587c69bab5adbb7353c621270cc75e1721c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 4 Dec 2017 19:12:45 +0000 Subject: [PATCH 3/3] ed: enable check on darwin --- pkgs/applications/editors/ed/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index b611d3319d7a..6c2f1ea2003c 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -13,16 +13,7 @@ stdenv.mkDerivation rec { 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); + doCheck = hostPlatform == buildPlatform; meta = { description = "An implementation of the standard Unix editor";