3
0
Fork 0
forked from mirrors/nixpkgs

plan9port:

- Update to 20140306
	- Fixed libXt dependency.  The compiler could not find X11/IntrinsicP.h, even though it is available through the nix store.  I think there must be some issue with the 9c compiler being used and not obeying the CFLAGS that nix is supposed to pass.  There are probably other dependencies I'm missing, but 9c found in my /usr/include.
This commit is contained in:
Victor van Poppelen 2014-07-31 00:38:00 -04:00
parent 7d90959d73
commit d2efe7785e
2 changed files with 13 additions and 6 deletions

View file

@ -2,7 +2,11 @@ source $stdenv/setup
tar xvfz $src
cd plan9
cd plan9port
cflags="echo \"CFLAGS='-I${libXt}/include'\" >> \$PLAN9/config"
sed -i "43i\\${cflags}" INSTALL
for p in $patches; do
echo "applying patch $p"

View file

@ -1,19 +1,20 @@
{stdenv, fetchurl, libX11
{stdenv, fetchurl, libX11, libXt
, xproto ? null
, libXt ? null
, xextproto ? null
, libXext ? null }:
stdenv.mkDerivation rec {
name = "plan9port-20140228";
name = "plan9port-20140306";
patches = [ ./fontsrv.patch ];
builder = ./builder.sh;
src = fetchurl {
url = "http://swtch.com/plan9port/${name}.tgz";
sha256 = "1l7nsjfrrcq0l43kw0f1437jz3nyl9qw7i2vn0sbmcsv5vmsj0cr";
url = "https://plan9port.googlecode.com/files/${name}.tgz";
# Google code is much faster than swtch
# url = "http://swtch.com/plan9port/${name}.tgz";
sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b";
};
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 xproto libXt xextproto libXext ];
@ -23,4 +24,6 @@ stdenv.mkDerivation rec {
description = "Plan 9 from User Space";
license="free";
};
inherit libXt;
}