diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-18 09:39:59 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-18 09:39:59 +0000 |
commit | 7f5b839524cad9211699c68ea02d11c1758a800b (patch) | |
tree | ed963d727a8e719d2e1eae8ed31454d59ba2aba3 /pkgs/applications/networking/instant-messengers/psi | |
parent | 52e9488541dc9e207d853ce2aa31d0e453c34767 (diff) |
* Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'. * Replaced `with args' with formal function arguments in several packages. * Renamed several files to `default.nix'. As a general rule, version numbers should only be included in the filename when there is a reason to keep multiple versions of a package in Nixpkgs. Otherwise, it just makes it harder to update the package. svn path=/nixpkgs/trunk/; revision=18403
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/psi')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/default.nix (renamed from pkgs/applications/networking/instant-messengers/psi/0.12.1.nix) | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 110189598f6c7..0db1af883cb80 100644 --- a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,19 +1,24 @@ -args : with args; +{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2 }: + stdenv.mkDerivation rec { + name = "psi-0.12.1"; + src = fetchurl { - url = mirror://sourceforge/psi/psi-0.12.1.tar.bz2; + url = "mirror://sourceforge/psi/${name}.tar.bz2"; sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8"; }; buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; + NIX_LDFLAGS="-lqca"; - configureFlags = [ " --with-zlib-inc=${zlib}/include " - " --disable-bundled-qca" ]; + configureFlags = + [ " --with-zlib-inc=${zlib}/include " + " --disable-bundled-qca" + ]; - name = "psi-" + version; meta = { description = "Psi, an XMPP (Jabber) client"; }; |