alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

freenet: Fix build

Browse source 
Also change the name attribute from "freenet-official" to "freenet".
This commit is contained in:
Eelco Dolstra 2014-01-03 14:32:13 +01:00
parent d150d49128
commit 94d5776436
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/p2p/freenet/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheAntOpenJDK, jre }: { stdenv, fetchurl, ant, jdk }:
let let
# The .gitmodules in freenet-official-20130413-eccc9b3198 # The .gitmodules in freenet-official-20130413-eccc9b3198
@ -14,7 +14,7 @@ let
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "freenet-official-20130413-eccc9b3198"; name = "freenet-20130413-eccc9b3198";
src = fetchurl { src = fetchurl {
url = https://github.com/freenet/fred-official/tarball/eccc9b3198; url = https://github.com/freenet/fred-official/tarball/eccc9b3198;
@ -29,7 +29,7 @@ stdenv.mkDerivation {
sed '/antcall.*-ext/d' -i build.xml sed '/antcall.*-ext/d' -i build.xml
''; '';
buildInputs = [ apacheAntOpenJDK jre ]; buildInputs = [ ant jdk ];
buildPhase = "ant package-only"; buildPhase = "ant package-only";
@ -41,13 +41,13 @@ stdenv.mkDerivation {
cat <<EOF > $out/bin/freenet cat <<EOF > $out/bin/freenet
#!${stdenv.shell} #!${stdenv.shell}
${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\ ${jdk.jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
-Xmx1024M freenet.node.NodeStarter -Xmx1024M freenet.node.NodeStarter
EOF EOF
chmod +x $out/bin/freenet chmod +x $out/bin/freenet
''; '';
meta = { meta = {
description = "Decentralised and censorship-resistant network"; description = "Decentralised and censorship-resistant network";
homepage = https://freenetproject.org/; homepage = https://freenetproject.org/;
license = "GPLv2+"; license = "GPLv2+";