diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-08-25 20:37:57 +0300 |
---|---|---|
committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-08-25 20:37:57 +0300 |
commit | 0851e6aa7d35bd13724b2be126135a737e81a20a (patch) | |
tree | f8c0bbb9f313b63845a6dd8efd091c6928b57358 /pkgs/tools/system | |
parent | 7795085c73b1ef1bc5ea7e78a6744796297b7d0c (diff) | |
parent | 195671aa700e3dc2b65c699201a4ade30846204b (diff) | |
download | nixlib-0851e6aa7d35bd13724b2be126135a737e81a20a.tar nixlib-0851e6aa7d35bd13724b2be126135a737e81a20a.tar.gz nixlib-0851e6aa7d35bd13724b2be126135a737e81a20a.tar.bz2 nixlib-0851e6aa7d35bd13724b2be126135a737e81a20a.tar.lz nixlib-0851e6aa7d35bd13724b2be126135a737e81a20a.tar.xz nixlib-0851e6aa7d35bd13724b2be126135a737e81a20a.tar.zst nixlib-0851e6aa7d35bd13724b2be126135a737e81a20a.zip |
Merge pull request #9410 from KoviRobi/plan9port-update
plan9port: 20140306 -> git-2015-06-29
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/plan9port/builder.sh | 41 | ||||
-rw-r--r-- | pkgs/tools/system/plan9port/default.nix | 20 |
2 files changed, 36 insertions, 25 deletions
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 2131a5bad868..023ceef40f23 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -1,23 +1,34 @@ source $stdenv/setup -tar xvfz $src +export PLAN9=$out/plan9 -cd plan9port +configurePhase() +{ + echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config + echo X11=\"${libXt}/include\" >> LOCAL.config -echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config -echo X11=\"${libXt}/include\" >> LOCAL.config + for f in `grep -l -r /usr/local/plan9`; do + sed "s,/usr/local/plan9,${PLAN9},g" -i $f + done +} -for p in $patches; do - echo "applying patch $p" - patch -p1 < $p -done +buildPhase() +{ + mkdir -p $PLAN9 + ./INSTALL -b $PLAN9 +} -export PLAN9=$out/plan9 -mkdir -p $PLAN9 +installPhase() +{ + ./INSTALL -c -r $PLAN9 + # Copy sources + cp -R * $PLAN9 -for f in `grep -l -r /usr/local/plan9`; do - sed "s,/usr/local/plan9,${PLAN9},g" -i $f -done + # Copy the `9' utility. This way you can use + # $ 9 awk + # to use the plan 9 awk + mkdir $out/bin + ln -s $PLAN9/bin/9 $out/bin +} -./INSTALL -r $PLAN9 -cp -R * $PLAN9 +genericBuild diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index ca248da56cf1..86ce1f14a8c5 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,10 +1,17 @@ -{stdenv, fetchurl, which, libX11, libXt, fontconfig +{stdenv, fetchgit, which, libX11, libXt, fontconfig , xproto ? null , xextproto ? null , libXext ? null }: stdenv.mkDerivation rec { - name = "plan9port-20140306"; + name = "plan9port-2015-06-29"; + + src = fetchgit { + # Latest, same as on github, google code is old + url = "https://plan9port.googlesource.com/plan9"; + rev = "71de840"; + sha256 = "1ffece7c0a5775a8bde6a0618c7ae3da4048449008a19e6623e8e5553f133b4c"; + }; patches = [ ./fontsrv.patch ]; postPatch = @@ -15,13 +22,6 @@ stdenv.mkDerivation rec { builder = ./builder.sh; - src = fetchurl { - url = "https://plan9port.googlecode.com/files/${name}.tgz"; - # Google code is much faster than swtch - # url = "http://swtch.com/plan9port/${name}.tgz"; - sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b"; - }; - NIX_LDFLAGS="-lgcc_s"; buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "http://swtch.com/plan9port/"; description = "Plan 9 from User Space"; license = licenses.lpl-102; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ]; platforms = platforms.unix; }; |