From 0473307f8763c60e88948bed5313affa1aabdfba Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 4 Apr 2020 02:26:55 +0100 Subject: feat(third_party/ffmpeg): Add "libnpp" support to ffmpeg 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 --- third_party/default.nix | 2 ++ third_party/ffmpeg/default.nix | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 third_party/ffmpeg/default.nix diff --git a/third_party/default.nix b/third_party/default.nix index 69b5de38c8..56a1529853 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 0000000000..e1b4d759da --- /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" + ]; +}) -- cgit 1.4.1