diff options
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 13 deletions
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 e60d37ed4a26..cf42dd5700ba 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, libotr, pidgin} : +{ stdenv, fetchurl, libotr, pidgin, intltool } : -stdenv.mkDerivation { - name = "pidgin-otr-3.2.0"; +stdenv.mkDerivation rec { + name = "pidgin-otr-4.0.0"; src = fetchurl { - url = http://www.cypherpunks.ca/otr/pidgin-otr-3.2.0.tar.gz; - sha256 = "1cp6s565sid657lvmm7jrwl9wnk4ywsl8d9sp4iba36r0s5qaw08"; + url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; + sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym"; }; + postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; + + buildInputs = [ libotr pidgin intltool ]; + meta = { - description = "OTR plugin for Pidgin IM."; homepage = http://www.cypherpunks.ca/otr; + description = "Plugin for Pidgin 2.x which implements OTR Messaging"; + license = "GPLv2"; }; - - postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - - buildInputs = [libotr pidgin]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21ae167919fc..680ee200c849 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7661,9 +7661,7 @@ let pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; - pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { - libotr = libotr_3_2; - }; + pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; |