plan9port: 2019-02-25 -> 2020-01-08

This commit is contained in:
Jason Felice 2020-04-10 11:46:48 -04:00
parent f601ab37c2
commit a83bafb27e
2 changed files with 3 additions and 45 deletions

View File

@ -11,17 +11,16 @@
stdenv.mkDerivation {
pname = "plan9port";
version = "2019-02-25";
version = "2020-01-08";
src = fetchFromGitHub {
owner = "9fans";
repo = "plan9port";
rev = "047fd921744f39a82a86d9370e03f7af511e6e84";
sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43";
rev = "cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e";
sha256 = "0gb55kj0gzx1kdhiwcrbr7xcgz1im21dyxgxhfhh6d0q9rw0c17g";
};
patches = [
./tmpdir.patch
./darwin-sw_vers.patch
./darwin-cfframework.patch
];

View File

@ -1,41 +0,0 @@
From c762625549ff367b54bcd8281d1ce248a69b4401 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Mon, 1 Jul 2019 15:01:21 -0400
Subject: [PATCH] Use $TMPDIR if available
NixOS sandboxed builds (at least on Mac) don't have access to /tmp,
and this should be better POSIX.
---
bin/9c | 2 +-
bin/9l | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/9c b/bin/9c
index 3ffb716c..88c47887 100755
--- a/bin/9c
+++ b/bin/9c
@@ -133,7 +133,7 @@ case "$tag" in
esac
# N.B. Must use temp file to avoid pipe; pipe loses status.
-xtmp=/tmp/9c.$$.$USER.out
+xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out
$cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp
status=$?
quiet $xtmp
diff --git a/bin/9l b/bin/9l
index 6195815f..717a540a 100755
--- a/bin/9l
+++ b/bin/9l
@@ -346,7 +346,7 @@ then
echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks
fi
-xtmp=/tmp/9l.$$.$USER.out
+xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out"
xxout() {
sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . |
egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub'
--
2.21.0