cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #32322 from berce/staging

Browse source 
ed: fix docs location. Fixes #32150. Supersedes #32315.
This commit is contained in:
Orivej Desh 2017-12-04 23:33:08 +00:00 committed by GitHub
commit a9b5900360
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/editors/ed/default.nix
View file

@ -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";

3
pkgs/tools/compression/lzip/default.nix
View file

@ -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;

5
pkgs/tools/compression/lzip/lzip-setup-hook.sh Normal file
View file

@ -0,0 +1,5 @@
lzipUnpackCmdHook() {
[[ "$1" = *.tar.lz ]] && tar --lzip -xf "$1"
}
unpackCmdHooks+=(lzipUnpackCmdHook)