Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7413c884f052
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6cd0603d758c
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 8, 2019

  1. ffmpeg-full: nvenc doesn't imply nonfree licensing

    @jacereda
    jacereda committed Feb 8, 2019
    Copy the full SHA
    ce211e6 View commit details

Commits on May 9, 2019

  1. nvenc: remove obsolete nvidia-video-sdk

    @jacereda
    jacereda committed May 9, 2019
    Copy the full SHA
    b869a42 View commit details

Commits on May 10, 2019

  1. nv-codec-headers: fix license

    @jacereda
    jacereda committed May 10, 2019
    Copy the full SHA
    65c52e1 View commit details

  2. Merge pull request #55442 from jacereda/fix-nvenc-licensing 

    ffmpeg-full: nvenc doesn't imply nonfree licensing
    @c0bw3b
    c0bw3b authored May 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6cd0603 View commit details
Showing with 3 additions and 4 deletions.
  1. +2 −3 pkgs/development/libraries/ffmpeg-full/default.nix
  2. +1 −1 pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
5 changes: 2 additions & 3 deletions pkgs/development/libraries/ffmpeg-full/default.nix
View file
Original file line number Diff line number Diff line change
@@ -96,7 +96,7 @@
, libxcbshapeExtlib ? true # X11 grabbing shape rendering
, libXv ? null # Xlib support
, lzma ? null # xz-utils
, nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support
, nvenc ? false # NVIDIA NVENC support
, callPackage # needed for NVENC to access external ffmpeg nvidia headers
, openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code
@@ -228,7 +228,6 @@ assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null;
assert openglExtlib -> libGLU_combined != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;

stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
@@ -417,7 +416,7 @@ stdenv.mkDerivation rec {
++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration
libiconv ];
2 changes: 1 addition & 1 deletion pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "ffmpeg nvidia headers for NVENC";
homepage = http://ffmpeg.org/;
license = stdenv.lib.licenses.gpl3Plus;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.MP2E ];
platforms = stdenv.lib.platforms.all;
};