From 282c064669042baf99ea0086a79d3c797fef5a04 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 17 Aug 2007 09:31:09 +0000 Subject: [PATCH] Moved pidgin-latex to pidgin-plugins, added aggregatable link for pidgin-otr. svn path=/nixpkgs/trunk/; revision=9147 --- .../instant-messengers/pidgin-plugins/otr/default.nix | 2 ++ .../{ => pidgin-plugins}/pidgin-latex/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/applications/networking/instant-messengers/{ => pidgin-plugins}/pidgin-latex/default.nix (100%) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index d171cfebf92b..cde1cb2534b2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -11,5 +11,7 @@ stdenv.mkDerivation { description = "OTR plugin for Pidgin IM."; }; + postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; + buildInputs = [libotr pidgin]; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/pidgin-latex/default.nix rename to pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3aa0d504613..0c4e8fe3277c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3066,7 +3066,7 @@ rec { inherit (xlibs) libXScrnSaver; }; - pidginlatex = import ../applications/networking/instant-messengers/pidgin-latex { + pidginlatex = import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { inherit fetchurl stdenv tetex pkgconfig imagemagick ghostscript pidgin; inherit (gtkLibs) glib gtk; };