diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-11-09 20:47:29 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2017-11-09 21:11:30 +0800 |
| commit | 1529295c9b9788a5e04c3d02bbd6a15c3f060b07 (patch) | |
| tree | b1163d633638d092cec383da5ee382ba3b138f22 /pkgs | |
| parent | 364eebd16f60c788ebb68751ed2bf007a008e898 (diff) | |
| download | nixlib-1529295c9b9788a5e04c3d02bbd6a15c3f060b07.tar nixlib-1529295c9b9788a5e04c3d02bbd6a15c3f060b07.tar.gz nixlib-1529295c9b9788a5e04c3d02bbd6a15c3f060b07.tar.bz2 nixlib-1529295c9b9788a5e04c3d02bbd6a15c3f060b07.tar.lz nixlib-1529295c9b9788a5e04c3d02bbd6a15c3f060b07.tar.xz nixlib-1529295c9b9788a5e04c3d02bbd6a15c3f060b07.tar.zst nixlib-1529295c9b9788a5e04c3d02bbd6a15c3f060b07.zip | |
qtox: fix compilation
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/qtox/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 0bc3118d101b..9cf6f4f2a408 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -13,18 +13,18 @@ mkDerivation rec { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "1832ay0167qjc2vvpps507mnb0531y3d3pxmlm5nakvcwjs7vl8d"; + sha256 = "1l1k8s10jj6nm9i33m8xhjwdhikvp7csdp6x1gxjxdj526aak8q9"; }; buildInputs = [ libtoxcore libpthreadstubs libXdmcp libXScrnSaver - qtbase qtsvg qttools qttranslations + qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium libvpx openal opencv pcre qrencode sqlcipher ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aceb0c72fef..17eca4b70c46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16253,7 +16253,7 @@ with pkgs; qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { }; - qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { ffmpeg = ffmpeg_2; }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; |