spiped: 1.3.0 -> 1.4.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2014-09-20 07:05:15 -05:00
parent 3b45556a3b
commit 49a5832805
2 changed files with 15 additions and 31 deletions

View File

@ -2,18 +2,28 @@
stdenv.mkDerivation rec {
name = "spiped-${version}";
version = "1.3.1";
version = "1.4.1";
src = fetchurl {
url = "http://www.tarsnap.com/spiped/${name}.tgz";
sha256 = "1viglk61v1v2ga1n31r0h8rvib5gy2h02lhhbbnqh2s6ps1sjn4a";
sha256 = "1y642mn4jz2h83vhkji0l42r2l1hbzbwwlplc3xmr66zjj54psqf";
};
buildInputs = [ openssl ];
patches = [ ./no-dev-stderr.patch ];
postPatch = ''
substituteInPlace POSIX/posix-l.sh --replace "rm" "${coreutils}/bin/rm"
patchPhase = ''
substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \
--replace "2>/dev/null" "2>stderr.log"
substituteInPlace POSIX/posix-l.sh \
--replace "rm" "${coreutils}/bin/rm" \
--replace ">/dev/stderr" ">stderr.log" \
--replace "2>/dev/null" "2>stderr.log"
substituteInPlace POSIX/posix-cflags.sh \
--replace "rm" "${coreutils}/bin/rm" \
--replace ">/dev/stderr" ">stderr.log" \
--replace "2>/dev/null" "2>stderr.log"
'';
installPhase = ''

View File

@ -1,26 +0,0 @@
From 7a2bbb0d0098d7a33ad3794d0199879ad50e755a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 8 Apr 2014 06:21:41 -0500
Subject: [PATCH] Remove use of /dev/stderr
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
POSIX/posix-l.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/POSIX/posix-l.sh b/POSIX/posix-l.sh
index b3f0e31..71d6fe8 100755
--- a/POSIX/posix-l.sh
+++ b/POSIX/posix-l.sh
@@ -7,8 +7,6 @@ for LIB in rt xnet; do
fi
printf "%s" "-l${LIB}";
FIRST=NO;
- else
- echo "WARNING: POSIX violation: make's CC doesn't understand -l${LIB}" >/dev/stderr
fi
rm -f a.out
done
--
1.8.3.2