nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-01 01:33:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge #3416: plan9port: update

Browse Source
This commit is contained in:
Vladimír Čunát 2014-08-15 00:00:28 +02:00
commit 4a93a5f8f4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/system/plan9port/builder.sh
View File

@ -2,14 +2,17 @@ source $stdenv/setup
tar xvfz $src 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 for p in $patches; do
echo "applying patch $p" echo "applying patch $p"
patch -p1 < $p patch -p1 < $p
done done
./INSTALL -b
./INSTALL -r $out/plan9 ./INSTALL -r $out/plan9
export PLAN9=$out/plan9 export PLAN9=$out/plan9

13
pkgs/tools/system/plan9port/default.nix
View File

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