plan9port 2015-11-10 -> 2016-04-18 (#18228)

This commit is contained in:
Ram Kromberg 2016-09-04 15:52:34 +03:00 committed by Emery Hemingway
parent dec3d5dd68
commit c40578ccbb

View File

@ -8,13 +8,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "plan9port-2015-11-10"; name = "plan9port-2016-04-18";
src = fetchgit { src = fetchgit {
# Latest, same as on github, google code is old # Latest, same as on github, google code is old
url = "https://plan9port.googlesource.com/plan9"; url = "https://plan9port.googlesource.com/plan9";
rev = "0d2dfbc"; rev = "35d43924484b88b9816e40d2f6bff4547f3eec47";
sha256 = "1h16wvps4rfkjim2ihkmniw8wzl7yill5910larci1c70x6zcicf"; sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc";
}; };
patches = [ patches = [
@ -29,23 +29,29 @@ stdenv.mkDerivation rec {
find . -type f \ find . -type f \
-exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \ -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \
-exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \; -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \;
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
#add missing ctrl+c\z\x\v keybind for non-Darwin
substituteInPlace src/cmd/acme/text.c \
--replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \
--replace "case Kcmd+'z':" "case 0x1a: case Kcmd+'z':" \
--replace "case Kcmd+'x':" "case 0x18: case Kcmd+'x':" \
--replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
''; '';
builder = ./builder.sh; builder = ./builder.sh;
NIX_LDFLAGS="-lgcc_s"; NIX_LDFLAGS="-lgcc_s";
buildInputs = stdenv.lib.optionals buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [
(!stdenv.isDarwin) which
[ which perl
perl libX11
libX11 fontconfig
fontconfig xproto
xproto libXt
libXt xextproto
xextproto libXext
libXext freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam.
freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. ];
];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -53,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "http://swtch.com/plan9port/"; homepage = "http://swtch.com/plan9port/";
description = "Plan 9 from User Space"; description = "Plan 9 from User Space";
license = licenses.lpl-102; license = licenses.lpl-102;
maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ]; maintainers = with maintainers; [ ftrvxmtrx kovirobi ];
platforms = platforms.unix; platforms = platforms.unix;
}; };