diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-04 19:08:11 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-12-04 23:31:48 +0000 |
| commit | 0bb47027abfcbdb6a05c0a8a8eba265c4307bdaa (patch) | |
| tree | a1acc1822fe8f264481985e5b8051d792c6adc0d | |
| parent | a865d17b7cd1599f6d0e5512147e15bbc75561ba (diff) | |
lzip: add unpackCmd hook
| -rw-r--r-- | pkgs/applications/editors/ed/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/lzip/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/compression/lzip/lzip-setup-hook.sh | 5 |
3 files changed, 8 insertions, 2 deletions
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) |