summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Hoeg <peter@speartail.com>2017-02-14 14:58:28 +0800
committerPeter Hoeg <peter@speartail.com>2017-02-14 14:58:28 +0800
commit5a88ab3f55327a87c44671178d9304312b3f9df4 (patch)
treecf4d395fa4cccd08a41895ec63133450b86c20c8 /pkgs
parent8cef304ede7f8d9d3647dcb885e05df9d097469c (diff)
downloadnixlib-5a88ab3f55327a87c44671178d9304312b3f9df4.tar
nixlib-5a88ab3f55327a87c44671178d9304312b3f9df4.tar.gz
nixlib-5a88ab3f55327a87c44671178d9304312b3f9df4.tar.bz2
nixlib-5a88ab3f55327a87c44671178d9304312b3f9df4.tar.lz
nixlib-5a88ab3f55327a87c44671178d9304312b3f9df4.tar.xz
nixlib-5a88ab3f55327a87c44671178d9304312b3f9df4.tar.zst
nixlib-5a88ab3f55327a87c44671178d9304312b3f9df4.zip
tox-prpl: 20141202 -> 0.5.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix24
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 90f6655d1453..3997980bed41 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,29 +1,27 @@
 { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
 
-let
-  version = "dd181722ea";
-  date = "20141202";
-in
 stdenv.mkDerivation rec {
-  name = "tox-prpl-${date}-${version}";
+  name = "tox-prpl-${version}";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
-    owner = "jin-eld";
-    repo = "tox-prpl";
-    rev = "${version}";
-    sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v";
+    owner  = "jin-eld";
+    repo   = "tox-prpl";
+    rev    = "v${version}";
+    sha256 = "0ms367l2f7x83k407c93bmhpyc820f1css61fh2gx4jq13cxqq3p";
   };
 
   NIX_LDFLAGS = "-lssp -lsodium";
 
   postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
 
-  buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];
+  buildInputs = [ libtoxcore pidgin libsodium ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tox.dhs.org/;
     description = "Tox plugin for Pidgin / libpurple";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b95dca132e2f..ca76d235c672 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14640,7 +14640,9 @@ with pkgs;
 
   telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };
 
-  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
+  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
+    libtoxcore = libtoxcore-new;
+  };
 
   pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };