diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 14:32:13 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 14:32:13 +0100 |
| commit | 94d577643662c9024985824c4671797dea324501 (patch) | |
| tree | 35507ee3935ca6fa7284cec8e950245e3ffecd35 /pkgs/applications/networking/p2p | |
| parent | d150d491280399565aa541487aa22d1a8b824039 (diff) | |
| download | nixlib-94d577643662c9024985824c4671797dea324501.tar nixlib-94d577643662c9024985824c4671797dea324501.tar.gz nixlib-94d577643662c9024985824c4671797dea324501.tar.bz2 nixlib-94d577643662c9024985824c4671797dea324501.tar.lz nixlib-94d577643662c9024985824c4671797dea324501.tar.xz nixlib-94d577643662c9024985824c4671797dea324501.tar.zst nixlib-94d577643662c9024985824c4671797dea324501.zip | |
freenet: Fix build
Also change the name attribute from "freenet-official" to "freenet".
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/freenet/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 67037a071327..4c74c2c32de0 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apacheAntOpenJDK, jre }: +{ stdenv, fetchurl, ant, jdk }: let # The .gitmodules in freenet-official-20130413-eccc9b3198 @@ -14,7 +14,7 @@ let }; in stdenv.mkDerivation { - name = "freenet-official-20130413-eccc9b3198"; + name = "freenet-20130413-eccc9b3198"; src = fetchurl { url = https://github.com/freenet/fred-official/tarball/eccc9b3198; @@ -29,7 +29,7 @@ stdenv.mkDerivation { sed '/antcall.*-ext/d' -i build.xml ''; - buildInputs = [ apacheAntOpenJDK jre ]; + buildInputs = [ ant jdk ]; buildPhase = "ant package-only"; @@ -41,13 +41,13 @@ stdenv.mkDerivation { cat <<EOF > $out/bin/freenet #!${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 EOF chmod +x $out/bin/freenet ''; - meta = { + meta = { description = "Decentralised and censorship-resistant network"; homepage = https://freenetproject.org/; license = "GPLv2+"; |