From f0f4c78963da2e2fc31e3dff2320c77d2d73eac2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 4 Jul 2008 06:52:44 +0000 Subject: [PATCH] As Pidgin is updated for ICQ changes and Carrier is not and Carrier uses Pidgin's unmodified libpurple anyway, added a possibility to grab libpurple2 from Pidgin installation and use it for Carrier installation svn path=/nixpkgs/trunk/; revision=12257 --- .../instant-messengers/carrier/2.4.2.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index f20f939efeda..a880ebdcd945 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -1,4 +1,9 @@ args : with args; +/* + arguments: all buildInputs + optional: purple2Source: purple-2 source - place to copy libpurple from + (to use a fresher pidgin build) +*/ rec { src = fetchurl { url = http://downloads.sourceforge.net/funpidgin/carrier-2.4.2.tar.bz2; @@ -26,8 +31,18 @@ rec { export echo=echo '') []; + postInstall = if (lib.getAttr ["purple2Source"] null args) != null then + FullDepEntry ('' + ensureDir $out/lib/purple-2 + cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ + '') ["minInit" "defEnsureDir"] + else + noDepEntry ""; + /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]; + phaseNames = ["doConfigure" "preBuild" "doMakeInstall"] + ++ (lib.optional (postInstall.text != "") "postInstall") + ; name = "carrier-" + version; meta = {