diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
| commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
| tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/development/libraries/libtoxcore | |
| parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
| parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/development/libraries/libtoxcore')
| -rw-r--r-- | pkgs/development/libraries/libtoxcore/new-api/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index 1ccb1b9d5a3b..eff8e2449a13 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -2,13 +2,13 @@ , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20160131"; + name = "tox-core-dev-20160319"; src = fetchFromGitHub { owner = "irungentoo"; repo = "toxcore"; - rev = "94cc8b11ff473064526737936f64b6f9a19c239d"; - sha256 = "0njara08p5vmhs6kp04b7gxw8l6xrlmwnlb76n2g96v0rn0i9k2w"; + rev = "532629d486e3361c7d8d95b38293cc7d61dc4ee5"; + sha256 = "0x8mjrjiafgia9vy7w4zhfzicr2fljx8xgm2ppi4kva2r2z1wm2f"; }; NIX_LDFLAGS = "-lgcc_s"; |