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
This commit is contained in:
Michael Raskin
2008-03-20 15:40:26 +00:00
parent 95f0e6a1a7
commit 5f2bcdbdb6
6 changed files with 123 additions and 110 deletions
@@ -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";
};
}