JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47067 from bbarker/plan9port_update

Browse Source 
Updating plan9port
This commit is contained in:
Samuel Dionne-Riel 2018-10-08 12:51:36 -04:00 committed by GitHub
commit 4643428b65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/system/plan9port/builder.sh
View File

@ -5,7 +5,8 @@ export PLAN9_TARGET=$PLAN9
configurePhase()
{
echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include -I${freetype_dev}/include\" > LOCAL.config
echo CFLAGS=\"-I${fontconfig_dev}/include -I${xproto_exp}/include -I${xextproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config
echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xproto_exp}/lib -L${xextproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config
echo X11=\"${libXt_dev}/include\" >> LOCAL.config
for f in `grep -l -r /usr/local/plan9`; do

28
pkgs/tools/system/plan9port/default.nix
View File

@ -2,24 +2,23 @@
, xproto ? null
, xextproto ? null
, libXext ? null
, zlib ? null
# For building web manuals
, perl ? null
, samChordingSupport ? true #from 9front
}:
stdenv.mkDerivation rec {
name = "plan9port-2016-04-18";
name = "plan9port-2018-09-20";
src = fetchgit {
# Latest, same as on github, google code is old
url = "https://plan9port.googlesource.com/plan9";
rev = "35d43924484b88b9816e40d2f6bff4547f3eec47";
sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc";
url = "https://github.com/9fans/plan9port.git";
rev = "a82a8b6368274d77d42f526e379b74e79c137e26";
sha256 = "1icywcnqv0dz1mkm7giakii536nycp0ajxnmzkx4944dxsmhcwq1";
};
patches = [
./fontsrv.patch
] ++ stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ];
patches = stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ];
postPatch = ''
#hardcoded path
@ -59,11 +58,24 @@ stdenv.mkDerivation rec {
homepage = http://swtch.com/plan9port/;
description = "Plan 9 from User Space";
license = licenses.lpl-102;
maintainers = with maintainers; [ ftrvxmtrx kovirobi ];
maintainers = with maintainers; [ bbarker ftrvxmtrx kovirobi ];
platforms = platforms.unix;
};
libX11_dev = libX11.dev;
libXt_dev = libXt.dev;
libXext_dev = libXext.dev;
fontconfig_dev = fontconfig.dev;
freetype_dev = freetype.dev;
zlib_dev = zlib.dev;
xproto_exp = xproto;
xextproto_exp = xextproto;
libX11_exp = libX11;
libXt_exp = libXt;
libXext_exp = libXext;
freetype_exp = freetype;
zlib_exp = zlib;
fontconfig_lib = fontconfig.lib;
}

14
pkgs/tools/system/plan9port/fontsrv.patch
View File

@ -1,14 +0,0 @@
diff -r dc0640f14d07 src/cmd/mkfile
--- a/src/cmd/mkfile Tue Mar 25 23:23:10 2014 -0400
+++ b/src/cmd/mkfile Mon Apr 14 22:36:05 2014 +0530
@@ -4,8 +4,8 @@
<$PLAN9/src/mkmany
-BUGGERED='CVS|faces|factotum|fontsrv|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
-DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV
+BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
+DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'`
<$PLAN9/src/mkdirs