From 2c8ff5fdb7a84f62def3f183e64172b33b48fad7 Mon Sep 17 00:00:00 2001 From: Siarhei Zirukin Date: Wed, 17 Dec 2014 23:36:50 +0100 Subject: [PATCH] plan9port: fix destination path in sources; add myself as a maintainer --- pkgs/tools/system/plan9port/builder.sh | 9 ++++++--- pkgs/tools/system/plan9port/default.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 1bd40aca07b..2131a5bad86 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -1,4 +1,3 @@ -set -e source $stdenv/setup tar xvfz $src @@ -13,8 +12,12 @@ for p in $patches; do patch -p1 < $p done -./INSTALL -r $out/plan9 - export PLAN9=$out/plan9 mkdir -p $PLAN9 + +for f in `grep -l -r /usr/local/plan9`; do + sed "s,/usr/local/plan9,${PLAN9},g" -i $f +done + +./INSTALL -r $PLAN9 cp -R * $PLAN9 diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 76087f553d6..709f83d3cbe 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://swtch.com/plan9port/"; description = "Plan 9 from User Space"; license = licenses.lpl-102; + maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; platforms = platforms.unix; };