BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

plan9port: fix interpreter paths, add perl

Browse source 
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:
Kovacsics Robert (NixOS-SSD2) 2015-09-10 13:50:51 +01:00
parent d61df24f36
commit d6e1ee5651
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/system/plan9port/builder.sh
View file

@ -1,6 +1,7 @@
source $stdenv/setup source $stdenv/setup
export PLAN9=$out/plan9 export PLAN9=$out/plan9
export PLAN9_TARGET=$PLAN9
configurePhase() configurePhase()
{ {
@ -15,12 +16,12 @@ configurePhase()
buildPhase() buildPhase()
{ {
mkdir -p $PLAN9 mkdir -p $PLAN9
./INSTALL -b $PLAN9 ./INSTALL -b
} }
installPhase() installPhase()
{ {
./INSTALL -c -r $PLAN9 ./INSTALL -c
# Copy sources # Copy sources
cp -R * $PLAN9 cp -R * $PLAN9

16
pkgs/tools/system/plan9port/default.nix
View file

@ -1,7 +1,9 @@
{stdenv, fetchgit, which, libX11, libXt, fontconfig {stdenv, fetchgit, which, libX11, libXt, fontconfig
, xproto ? null , xproto ? null
, xextproto ? null , xextproto ? null
, libXext ? null }: , libXext ? null
# For building web manuals
, perl ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "plan9port-2015-06-29"; name = "plan9port-2015-06-29";
@ -23,7 +25,17 @@ stdenv.mkDerivation rec {
builder = ./builder.sh; builder = ./builder.sh;
NIX_LDFLAGS="-lgcc_s"; 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; enableParallelBuilding = true;