diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-07-28 20:43:53 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-07-28 20:53:11 +0200 |
commit | 9edfad2717498c4f405b5ce93e0808e708d780ef (patch) | |
tree | a7908003b3cc535b93b287312efebedaefaaf651 | |
parent | e542ff7288e3712d66e534659fddafce5ddda5f7 (diff) | |
download | nixlib-9edfad2717498c4f405b5ce93e0808e708d780ef.tar nixlib-9edfad2717498c4f405b5ce93e0808e708d780ef.tar.gz nixlib-9edfad2717498c4f405b5ce93e0808e708d780ef.tar.bz2 nixlib-9edfad2717498c4f405b5ce93e0808e708d780ef.tar.lz nixlib-9edfad2717498c4f405b5ce93e0808e708d780ef.tar.xz nixlib-9edfad2717498c4f405b5ce93e0808e708d780ef.tar.zst nixlib-9edfad2717498c4f405b5ce93e0808e708d780ef.zip |
toxic: Update to latest upstream Git master.
Unfortunately they've changed their build system to be makefile-only and they don't seem to include test cases in the CLI anymore, so we needed to adapt accordingly. Also added freealut and openal to the buildInputs, in order to allow audio support. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r-- | pkgs/applications/networking/instant-messengers/toxic/default.nix | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 4527d981a9f0..b3e1ff74cfa5 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libtoxcore, pkgconfig }: +, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: let - version = "b308e19e6b"; - date = "20140224"; + version = "7566aa9d26"; + date = "20140728"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,26 +11,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0fgkvnpy3dl2h378h796z9md0zg05b3174fgx17b919av6j9x4ma"; + sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa"; }; - preConfigure = '' - autoreconf -i - ''; + makeFlags = [ "-Cbuild" "VERSION=${version}" ]; + installFlags = [ "PREFIX=$(out)" ]; - NIX_LDFLAGS = "-lsodium"; - - configureFlags = [ - "--with-libtoxcore-headers=${libtoxcore}/include" - "--with-libtoxcore-libs=${libtoxcore}/lib" - "--with-libsodium-headers=${libtoxcore}/include" - "--with-libsodium-libs=${libtoxcore}/lib" + buildInputs = [ + autoconf libtool automake libtoxcore libsodium ncurses openal libvpx + freealut libconfig pkgconfig ]; - buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ]; - - doCheck = true; - meta = { description = "Reference CLI for Tox"; license = stdenv.lib.licenses.gpl3Plus; |