plan9port: fix interpreter paths, add perl
Fixing interpreter paths was done by exporting PLAN9_TARGET, which INSTALL looks at. Giving $PLAN9 to INSTALL does not achieve this, as INSTALL only looks at its first argument so I removed the other arguments to avoid confusion. Perl is an optional dependency for a script that adds URLs to man pages, I have added it to get fewer errors during install.
This commit is contained in:
parent
d61df24f36
commit
d6e1ee5651
2 changed files with 17 additions and 4 deletions
|
@ -1,6 +1,7 @@
|
|||
source $stdenv/setup
|
||||
|
||||
export PLAN9=$out/plan9
|
||||
export PLAN9_TARGET=$PLAN9
|
||||
|
||||
configurePhase()
|
||||
{
|
||||
|
@ -15,12 +16,12 @@ configurePhase()
|
|||
buildPhase()
|
||||
{
|
||||
mkdir -p $PLAN9
|
||||
./INSTALL -b $PLAN9
|
||||
./INSTALL -b
|
||||
}
|
||||
|
||||
installPhase()
|
||||
{
|
||||
./INSTALL -c -r $PLAN9
|
||||
./INSTALL -c
|
||||
# Copy sources
|
||||
cp -R * $PLAN9
|
||||
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
{stdenv, fetchgit, which, libX11, libXt, fontconfig
|
||||
, xproto ? null
|
||||
, xextproto ? null
|
||||
, libXext ? null }:
|
||||
, libXext ? null
|
||||
# For building web manuals
|
||||
, perl ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "plan9port-2015-06-29";
|
||||
|
@ -23,7 +25,17 @@ stdenv.mkDerivation rec {
|
|||
builder = ./builder.sh;
|
||||
|
||||
NIX_LDFLAGS="-lgcc_s";
|
||||
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ];
|
||||
buildInputs = stdenv.lib.optionals
|
||||
(!stdenv.isDarwin)
|
||||
[ which
|
||||
perl
|
||||
libX11
|
||||
fontconfig
|
||||
xproto
|
||||
libXt
|
||||
xextproto
|
||||
libXext
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
Loading…
Reference in a new issue