diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-04-30 04:07:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 04:07:30 +0000 |
| commit | 12d89a7ed960243955f3fa8b4de8ac5b38018890 (patch) | |
| tree | 6488afb9ed56cd53542e340b85e0690cd9fa02f4 /pkgs/top-level | |
| parent | cf194a93115ac1354f0e49f49c1f44aac74b3d6d (diff) | |
| parent | 8811d1d384d38962927450cf8f69d675f72ee80a (diff) | |
Merge pull request #39147 from peterhoeg/u/tox
tox: libtoxcore and assorted tox client updates
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77f54000df8b..719a5c66db7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5218,7 +5218,7 @@ with pkgs; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; - toxvpn = callPackage ../tools/networking/toxvpn { }; + toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; }; tpmmanager = callPackage ../applications/misc/tpmmanager { }; @@ -10360,9 +10360,12 @@ with pkgs; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; - libtoxcore = callPackage ../development/libraries/libtoxcore { }; + inherit (callPackages ../development/libraries/libtoxcore {}) + libtoxcore_0_1 libtoxcore_0_2; + libtoxcore = libtoxcore_0_2; libtap = callPackage ../development/libraries/libtap { }; @@ -17467,7 +17470,7 @@ with pkgs; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { ffmpeg = ffmpeg_2; }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; |