diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 79e7601e46e0..f189d2eb7813 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -1,31 +1,38 @@ -{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }: +{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }: with builderDefs; - let localDefs = builderDefs.passthru.function ((rec { - src = /* put a fetchurl here */ - fetchurl { - url = http://launchpad.net/linuxdcpp/1.0/1.0.3/+download/linuxdcpp-1.0.3.tar.bz2; - sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv"; - }; + let localDefs = builderDefs.passthru.function ((rec { + src = /* put a fetchurl here */ + fetchurl { + url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; + sha256 = "66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a"; + }; - buildInputs = [scons pkgconfig gtk bzip2 libglade - openssl libX11]; - configureFlags = []; - doScons = fullDepEntry ('' - ensureDir $out - export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; - scons PREFIX=$out - scons PREFIX=$out install - '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; - })); - in with localDefs; + buildInputs = [scons pkgconfig gtk bzip2 libglade + openssl libX11 boost]; + configureFlags = []; + doScons = fullDepEntry ('' + ensureDir $out + export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; + + for i in gettext xgettext msgfmt msgcat; do + echo > $i + chmod a+x $i + done + export PATH=$PATH:$PWD + + scons PREFIX=$out + scons PREFIX=$out install + '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; + })); + in with localDefs; stdenv.mkDerivation rec { - name = "ldcpp-1.0.3"; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doScons doForceShare doPropagate]); - meta = { - description = "Linux DC++ - Direct Connect client"; - inherit src; - }; + name = "ldcpp-1.1.0"; + builder = writeScript (name + "-builder") + (textClosure localDefs + [doScons doForceShare doPropagate]); + meta = { + description = "Linux DC++ - Direct Connect client"; + inherit src; + }; }