diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-03-20 15:40:26 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-03-20 15:40:26 +0000 |
| commit | 5f2bcdbdb6bb8bf39ccd749a0cf0e5c697a04e13 (patch) | |
| tree | 0598ae123d84f79a1cbef154d1dd38774c71e4ff /pkgs/applications/networking/instant-messengers/psi | |
| parent | 95f0e6a1a75dabb2131aae1db0a4ee30c802b2ca (diff) | |
Some refactorings in builderDefs. Psi is a simple showcase. TeXLive now works as far as English is concerned, and it is also updated up to newest builderDefs.
svn path=/nixpkgs/trunk/; revision=11235
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/psi')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/0.11.nix | 44 |
1 files changed, 17 insertions, 27 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/0.11.nix b/pkgs/applications/networking/instant-messengers/psi/0.11.nix index 5cd1ef1c43fa5..2f9d9e3b3b724 100644 --- a/pkgs/applications/networking/instant-messengers/psi/0.11.nix +++ b/pkgs/applications/networking/instant-messengers/psi/0.11.nix @@ -1,30 +1,20 @@ +args : with args; +rec { + src = fetchurl { + url = ftp://ftp.ru.debian.org/debian/pool/main/p/psi/psi_0.11.orig.tar.gz; + sha256 = "1rgjahngari4pwhi0zz9mricaaqxkk8ry8w6s1vgsq3zwa2l5x57"; + }; -args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs (rec { - src = /* put a fetchurl here */ - fetchurl { - url = ftp://ftp.ru.debian.org/debian/pool/main/p/psi/psi_0.11.orig.tar.gz; - sha256 = "1rgjahngari4pwhi0zz9mricaaqxkk8ry8w6s1vgsq3zwa2l5x57"; - }; + buildInputs = [aspell qt zlib sox openssl libX11 xproto + libSM libICE]; + configureFlags = [" --with-zlib-inc=${zlib}/include " + " --with-openssl-inc=${openssl}/include " + ]; - buildInputs = [aspell qt zlib sox openssl libX11 xproto - libSM libICE]; - configureFlags = [" --with-zlib-inc=${zlib}/include " - " --with-openssl-inc=${openssl}/include " - ]; - }) args null; /* null is a terminator for sumArgs */ - in with localDefs; -stdenv.mkDerivation rec { - name = "psi-"+version; - MAKE="make"; - builder = writeScript (name + "-builder") - (textClosure localDefs - ["doConfigure" "doMakeInstall" doForceShare doPropagate]); - meta = { - description = " - Psi, an XMPP (Jabber) client. -"; - inherit src; - }; + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "psi-" + version; + meta = { + description = "Psi, an XMPP (Jabber) client"; + }; } - |