diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-20 08:34:25 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-24 16:49:07 -0600 |
| commit | 0f5dbc3854974c8a89b1f6f86d357781e5d99bca (patch) | |
| tree | 3799e97a4b442c80c1a7765dff1963322d4c790f | |
| parent | e02de9e0176a6f550ba861598c2c2a0628f14c65 (diff) | |
| download | nixpkgs-0f5dbc3854974c8a89b1f6f86d357781e5d99bca.tar nixpkgs-0f5dbc3854974c8a89b1f6f86d357781e5d99bca.tar.gz nixpkgs-0f5dbc3854974c8a89b1f6f86d357781e5d99bca.tar.bz2 nixpkgs-0f5dbc3854974c8a89b1f6f86d357781e5d99bca.tar.lz nixpkgs-0f5dbc3854974c8a89b1f6f86d357781e5d99bca.tar.xz nixpkgs-0f5dbc3854974c8a89b1f6f86d357781e5d99bca.tar.zst nixpkgs-0f5dbc3854974c8a89b1f6f86d357781e5d99bca.zip | |
Revert "Remove kde4.psi"
This reverts commit c2fcc909cb42d9aaa456d211f9c68cc24f4ef804. - Upstream development is ongoing; we will keep psi for now to preserve continuity.
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix new file mode 100644 index 00000000000..7fabfa5f772 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM +, libICE, qca2, pkgconfig, callPackage, which, glib +, libXScrnSaver, scrnsaverproto +}: + +stdenv.mkDerivation rec { + name = "psi-0.15"; + + src = fetchurl { + url = "mirror://sourceforge/psi/${name}.tar.bz2"; + sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6"; + }; + + buildInputs = + [ enchant qt4 zlib sox libX11 xproto libSM libICE + qca2 pkgconfig which glib scrnsaverproto libXScrnSaver + ]; + + NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; + + NIX_LDFLAGS="-lqca"; + + enableParallelBuilding = true; + + meta = { + description = "Psi, an XMPP (Jabber) client"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c4221a5150..4959cc0b53e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16720,6 +16720,7 @@ with pkgs; krusader = callPackage ../applications/misc/krusader { }; massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {}; |