diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-31 18:00:28 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-08 21:50:42 +0200 |
| commit | 9146a62f51ae6ffbeab40b39eff7f0140c20b17e (patch) | |
| tree | 4e0c2263336cb29ac31e5d64cfe69be9344fedc1 /pkgs/applications/networking | |
| parent | 6ee129b29fcb2dcfe2c5d002c62b0117f14fd029 (diff) | |
| download | nixlib-9146a62f51ae6ffbeab40b39eff7f0140c20b17e.tar nixlib-9146a62f51ae6ffbeab40b39eff7f0140c20b17e.tar.gz nixlib-9146a62f51ae6ffbeab40b39eff7f0140c20b17e.tar.bz2 nixlib-9146a62f51ae6ffbeab40b39eff7f0140c20b17e.tar.lz nixlib-9146a62f51ae6ffbeab40b39eff7f0140c20b17e.tar.xz nixlib-9146a62f51ae6ffbeab40b39eff7f0140c20b17e.tar.zst nixlib-9146a62f51ae6ffbeab40b39eff7f0140c20b17e.zip | |
toxic: 20150125 -> 20160728
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/toxic/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index f733acf4133a..414b36b05e39 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses -, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: +{ stdenv, fetchFromGitHub, libsodium, ncurses, curl +, libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig +, libqrencode }: stdenv.mkDerivation rec { - name = "toxic-dev-20150125"; + name = "toxic-dev-20160728"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; - rev = "4badc983ea"; - sha256 = "01zk6316v51f1zvp5ss53ay49h3nnaq5snlk0gxmsrmwg71bsnm6"; + rev = "cb21672600206423c844306a84f8b122e534c348"; + sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k"; }; - makeFlags = [ "-Cbuild" "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ]; + nativeBuildInputs = [ pkgconfig libconfig ]; buildInputs = [ - autoconf libtool automake libtoxcore libsodium ncurses - libconfig pkgconfig + libtoxcore-dev libsodium ncurses libqrencode curl ] ++ stdenv.lib.optionals (!stdenv.isArm) [ openal libvpx freealut ]; |