From d8e0dfdc5b09739b1887e56fd32cc543ec01ef3c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 19 Apr 2015 15:55:04 +0200 Subject: [PATCH] ldcpp: reimplement using mkDerivation Also add libnotify support --- .../networking/p2p/ldcpp/default.nix | 53 ++++++++----------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 6f282b30fa14..14b68d71e79a 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -1,37 +1,28 @@ -{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }: +{ stdenv, fetchurl, scons, pkgconfig, gtk, bzip2, libglade, openssl +, libX11, boost, zlib, libnotify }: -with builderDefs; - 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 boost]; - configureFlags = []; - doScons = fullDepEntry ('' - mkdir -p $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.1.0"; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doScons doForceShare doPropagate]); + src = fetchurl { + url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; + sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"; + }; + buildInputs = [ scons pkgconfig gtk bzip2 libglade openssl libX11 boost libnotify ]; + + installPhase = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; + + touch gettext xgettext msgfmt msgcat + chmod +x gettext xgettext msgfmt msgcat + export PATH=$PATH:$PWD + + mkdir -p $out + scons PREFIX=$out + scons PREFIX=$out install + ''; + meta = { - description = "Linux DC++ - Direct Connect client"; + description = "Direct Connect client"; + license = stdenv.lib.licenses.gpl2; }; }