uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
56
pkgs/tools/networking/i2p/default.nix
Normal file
56
pkgs/tools/networking/i2p/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which, java-service-wrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i2p";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
|
||||
sha256 = "sha256-cZYGxMtRDeT+dPJLv6U5EacFMYIfwe55op49luqhZzM=";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk ant gettext which ];
|
||||
patches = [ ./i2p.patch ];
|
||||
|
||||
buildPhase = ''
|
||||
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
|
||||
ant preppkg-linux-only
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
set -B
|
||||
mkdir -p $out/{bin,share}
|
||||
cp -r pkg-temp/* $out
|
||||
|
||||
cp ${java-service-wrapper}/bin/wrapper $out/i2psvc
|
||||
cp ${java-service-wrapper}/lib/wrapper.jar $out/lib
|
||||
cp ${java-service-wrapper}/lib/libwrapper.so $out/lib
|
||||
|
||||
sed -i $out/i2prouter -i $out/runplain.sh \
|
||||
-e "s#uname#${coreutils}/bin/uname#" \
|
||||
-e "s#which#${which}/bin/which#" \
|
||||
-e "s#%gettext%#${gettext}/bin/gettext#" \
|
||||
-e "s#/usr/ucb/ps#${ps}/bin/ps#" \
|
||||
-e "s#/usr/bin/tr#${coreutils}/bin/tr#" \
|
||||
-e "s#%INSTALL_PATH#$out#" \
|
||||
-e 's#%USER_HOME#$HOME#' \
|
||||
-e "s#%SYSTEM_java_io_tmpdir#/tmp#" \
|
||||
-e "s#%JAVA%#${jre}/bin/java#"
|
||||
mv $out/runplain.sh $out/bin/i2prouter-plain
|
||||
mv $out/man $out/share/
|
||||
chmod +x $out/bin/* $out/i2psvc
|
||||
rm $out/{osid,postinstall.sh,INSTALL-headless.txt}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Applications and router for I2P, anonymity over the Internet";
|
||||
homepage = "https://geti2p.net";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
];
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = with maintainers; [ joelmo ];
|
||||
};
|
||||
}
|
||||
43
pkgs/tools/networking/i2p/i2p.patch
Normal file
43
pkgs/tools/networking/i2p/i2p.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
|
||||
index 365737d89..2ea14db3e 100644
|
||||
--- a/installer/resources/i2prouter
|
||||
+++ b/installer/resources/i2prouter
|
||||
@@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service"
|
||||
|
||||
# gettext - we look for it in the path
|
||||
# fallback to echo is below, we can't set it to echo here.
|
||||
-GETTEXT=$(which gettext > /dev/null 2>&1)
|
||||
+GETTEXT=%gettext%
|
||||
|
||||
# Where to install the systemd service
|
||||
SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
|
||||
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
|
||||
index eb4995dfe..0186cede3 100644
|
||||
--- a/installer/resources/runplain.sh
|
||||
+++ b/installer/resources/runplain.sh
|
||||
@@ -25,7 +25,7 @@ CP=
|
||||
|
||||
# Try using the Java binary that I2P was installed with.
|
||||
# If it's not found, try looking in the system PATH.
|
||||
-JAVA=$(which "%JAVA_HOME"/bin/java || which java)
|
||||
+JAVA=%JAVA%
|
||||
|
||||
if [ -z $JAVA ] || [ ! -x $JAVA ]; then
|
||||
echo "Error: Cannot find java." >&2
|
||||
@@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then
|
||||
export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
|
||||
fi
|
||||
JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
|
||||
-(
|
||||
- nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
|
||||
-) &
|
||||
-PID=$!
|
||||
-
|
||||
-if [ ! -z $PID ] && kill -0 $PID > /dev/null 2>&1 ; then
|
||||
- echo "I2P started [$PID]" >&2
|
||||
- echo $PID > "${I2PTEMP}/router.pid"
|
||||
-else
|
||||
- echo "I2P failed to start." >&2
|
||||
- exit 1
|
||||
-fi
|
||||
+exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch
|
||||
Loading…
Add table
Add a link
Reference in a new issue