diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-05-19 06:50:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 06:50:47 +0100 |
| commit | 3ef6d5d77cfd48abe44055208adb215d97fedd77 (patch) | |
| tree | feb79f0662c7715f3146850dba8ad1d65f270377 /pkgs/applications | |
| parent | 5b4915fb7a74ae13be2f9eb40a224f2005da2a4f (diff) | |
| parent | b275ddd6a1b0a10181f9f1016a71391a428ade36 (diff) | |
| download | nixpkgs-3ef6d5d77cfd48abe44055208adb215d97fedd77.tar nixpkgs-3ef6d5d77cfd48abe44055208adb215d97fedd77.tar.gz nixpkgs-3ef6d5d77cfd48abe44055208adb215d97fedd77.tar.bz2 nixpkgs-3ef6d5d77cfd48abe44055208adb215d97fedd77.tar.lz nixpkgs-3ef6d5d77cfd48abe44055208adb215d97fedd77.tar.xz nixpkgs-3ef6d5d77cfd48abe44055208adb215d97fedd77.tar.zst nixpkgs-3ef6d5d77cfd48abe44055208adb215d97fedd77.zip | |
Merge pull request #123620 from michojel/megasync-no-ffmpeg
megasync: temporarily remove ffmpeg dependency
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/megasync/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index b379a04a51d..07dc364fe0b 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -7,7 +7,7 @@ , curl , doxygen , fetchFromGitHub -, ffmpeg + #, ffmpeg , libmediainfo , libraw , libsodium @@ -52,7 +52,8 @@ mkDerivation rec { c-ares cryptopp curl - ffmpeg + # temporarily disable until patched for ffmpeg 4.4 + #ffmpeg libmediainfo libraw libsodium @@ -94,7 +95,8 @@ mkDerivation rec { "--with-cares" "--with-cryptopp" "--with-curl" - "--with-ffmpeg" + # temporarily disable until patched for ffmpeg 4.4 + #"--with-ffmpeg" "--without-freeimage" # unreferenced even when found "--without-readline" "--without-termcap" |