public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freenet: rewrite wrapper to not depend on PATH

Browse Source
This commit is contained in:
Shell Turner 2016-01-03 14:33:56 +00:00
parent 0d5542bc85
commit f229791454
2 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
pkgs/applications/networking/p2p/freenet/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, ant, jdk, makeWrapper }: { stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }:
let let
freenet_ext = fetchurl { freenet_ext = fetchurl {
@ -15,46 +15,56 @@ let
sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9"; sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9";
}; };
version = "build01470"; version = "build01470";
in
stdenv.mkDerivation {
name = "freenet-${version}";
freenet-jars = stdenv.mkDerivation {
name = "freenet-jars-${version}";
src = fetchgit { src = fetchgit {
url = https://github.com/freenet/fred; url = https://github.com/freenet/fred;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746"; sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";
};
patchPhase = ''
cp ${freenet_ext} lib/freenet/freenet-ext.jar
cp ${bcprov} lib/bcprov-jdk15on-152.jar
sed '/antcall.*-ext/d' -i build.xml
sed 's/@unknown@/${version}/g' -i build-clean.xml
'';
buildInputs = [ ant jdk ];
buildPhase = "ant package-only";
installPhase = ''
mkdir -p $out/share/freenet
cp lib/bcprov-jdk15on-152.jar $out/share/freenet
cp lib/freenet/freenet-ext.jar $out/share/freenet
cp dist/freenet.jar $out/share/freenet
'';
}; };
patchPhase = '' in stdenv.mkDerivation {
cp ${freenet_ext} lib/freenet/freenet-ext.jar name = "freenet-${version}";
cp ${bcprov} lib/bcprov-jdk15on-152.jar inherit version;
sed '/antcall.*-ext/d' -i build.xml src = substituteAll {
sed 's/@unknown@/${version}/g' -i build-clean.xml src = ./freenetWrapper;
''; inherit bash coreutils seednodes;
freenet = freenet-jars;
jre = jdk.jre;
};
buildInputs = [ ant jdk makeWrapper ]; jars = freenet-jars;
buildPhase = "ant package-only"; phases = [ "installPhase" ];
freenetWrapper = ./freenetWrapper;
installPhase = '' installPhase = ''
mkdir -p $out/share/freenet $out/bin mkdir -p $out/bin
cp lib/bcprov-jdk15on-152.jar $out/share/freenet cp $src $out/bin/freenet
cp lib/freenet/freenet-ext.jar $out/share/freenet chmod +x $out/bin/freenet
cp dist/freenet.jar $out/share/freenet ln -s ${freenet-jars}/share $out/share
cat <<EOF > $out/bin/freenet.wrapped
#!${stdenv.shell}
${jdk.jre}/bin/java -cp $out/share/freenet/bcprov-jdk15on-152.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
-Xmx1024M freenet.node.NodeStarter
EOF
chmod +x $out/bin/freenet.wrapped
makeWrapper $freenetWrapper $out/bin/freenet \
--set FREENET_ROOT "$out" \
--set FREENET_SEEDNODES "${seednodes}"
''; '';
meta = { meta = {

8
pkgs/applications/networking/p2p/freenet/freenetWrapper
View File

@ -1,4 +1,6 @@
#! /usr/bin/env bash #! @bash@/bin/bash
PATH=@coreutils@/bin:$PATH
export FREENET_HOME="$HOME/.local/share/freenet" export FREENET_HOME="$HOME/.local/share/freenet"
if [ -n "$XDG_DATA_HOME" ] if [ -n "$XDG_DATA_HOME" ]
@ -9,8 +11,8 @@ if [ ! -d $FREENET_HOME ]; then
mkdir -p $FREENET_HOME mkdir -p $FREENET_HOME
fi fi
cp -u $FREENET_SEEDNODES $FREENET_HOME/seednodes.fref cp -u @seednodes@ $FREENET_HOME/seednodes.fref
chmod u+rw $FREENET_HOME/seednodes.fref chmod u+rw $FREENET_HOME/seednodes.fref
cd $FREENET_HOME cd $FREENET_HOME
exec $FREENET_ROOT/bin/freenet.wrapped "$@" @jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter