diff options
author | Vincent Ambo <tazjin@google.com> | 2020-04-04T01·26+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-04-04T01·36+0100 |
commit | 0473307f8763c60e88948bed5313affa1aabdfba (patch) | |
tree | 75dcdaebf44e972affab4bcce57f1d9dd8727b3e | |
parent | bcfa11599d211ddeb4c5d12198b90dd444e10921 (diff) |
feat(third_party/ffmpeg): Add "libnpp" support to ffmpeg r/614
Builds ffmpeg with CUDA Toolkit as a dependency, which includes a library called "libnpp" that provides something related to hardware accelerated video stream resizing. v0v
-rw-r--r-- | third_party/default.nix | 2 | ||||
-rw-r--r-- | third_party/ffmpeg/default.nix | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index 69b5de38c878..56a152985307 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -35,6 +35,7 @@ let clang_9 cmake coreutils + cudatoolkit darwin dockerTools emacs26 @@ -119,6 +120,7 @@ in exposed // { # Packages to be overridden originals = { inherit (nixpkgs) git notmuch; + ffmpeg = nixpkgs.ffmpeg-full; }; # Make NixOS available diff --git a/third_party/ffmpeg/default.nix b/third_party/ffmpeg/default.nix new file mode 100644 index 000000000000..e1b4d759da70 --- /dev/null +++ b/third_party/ffmpeg/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +pkgs.originals.ffmpeg.overrideAttrs(old: { + buildInputs = old.buildInputs ++ [ + pkgs.cudatoolkit.out + ]; + + configureFlags = old.configureFlags ++ [ + "--enable-libnpp" + "--enable-nonfree" + ]; +}) |