public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating utox/libtoxcore to the latest, to fix utox build. 

There was a test failing. I also renamed the attr uTox to utox, for the more
common lowercase in all-packages.
This commit is contained in:
Lluís Batlle i Rossell 2014-09-23 23:05:33 +02:00
parent 4f5a71385e
commit 93fd8fb3a5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/utox/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "utox-dev-20140918"; name = "utox-dev-20140921";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "notsecure"; owner = "notsecure";
repo = "uTox"; repo = "uTox";
rev = "26d4308ad0"; rev = "c0afc95cf3";
sha256 = "0vc46dpg3hd7pfx8zny0wf546f1wfag7d8wj5rg47dg3wzwghz8p"; sha256 = "0a6i0c9crj6b27alm8q0fcfj8q425khg5305sp57r7pj505l4d1f";
}; };
buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype

6
pkgs/development/libraries/libtoxcore/default.nix
View File

@ -2,8 +2,8 @@
, libvpx, check, libconfig, pkgconfig }: , libvpx, check, libconfig, pkgconfig }:
let let
version = "7ec83c3623"; version = "900d72f951";
date = "20140918"; date = "20140921";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tox-core-${date}-${version}"; name = "tox-core-${date}-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/irungentoo/toxcore/tarball/${version}"; url = "https://github.com/irungentoo/toxcore/tarball/${version}";
name = "${name}.tar.gz"; name = "${name}.tar.gz";
sha256 = "026zv0brdqxf0h6zgyqpb55099yc6ghqgf8lrkdsfrrpb7ilg0is"; sha256 = "1fwgflizb21mp4jwkfac7mgmahlly1f3ldbma6h8h6a2qf3pkn2r";
}; };
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";

2
pkgs/top-level/all-packages.nix
View File

@ -10346,7 +10346,7 @@ let
webkit = webkitgtk2; webkit = webkitgtk2;
}; };
uTox = callPackage ../applications/networking/instant-messengers/utox { }; utox = callPackage ../applications/networking/instant-messengers/utox { };
vanitygen = callPackage ../applications/misc/vanitygen { }; vanitygen = callPackage ../applications/misc/vanitygen { };