alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #5245 from ftrvxmtrx/plan9port

Browse source 
plan9port: make it actually work
This commit is contained in:
cillianderoiste 2014-12-06 15:46:59 +00:00
parent 0d9001e934 60f2081019
commit 4687494b7c
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,12 +1,12 @@
set -e
source $stdenv/setup source $stdenv/setup
tar xvfz $src tar xvfz $src
cd plan9port cd plan9port
cflags="echo \"CFLAGS='-I${libXt}/include'\" >> \$PLAN9/config" echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
echo X11=\"${libXt}/include\" >> LOCAL.config
sed -i "43i\\${cflags}" INSTALL
for p in $patches; do for p in $patches; do
echo "applying patch $p" echo "applying patch $p"

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, libXt {stdenv, fetchurl, which, libX11, libXt, fontconfig
, xproto ? null , xproto ? null
, xextproto ? null , xextproto ? null
, libXext ? null }: , libXext ? null }:
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b"; sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b";
}; };
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 xproto libXt xextproto libXext ]; NIX_LDFLAGS="-lgcc_s";
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -29,4 +30,5 @@ stdenv.mkDerivation rec {
}; };
inherit libXt; inherit libXt;
inherit fontconfig;
} }