diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-24 22:20:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 22:20:41 +0000 |
| commit | efbd28f277f6a5596e4631d59af486143999814e (patch) | |
| tree | ca526d1a6501c7bd496f522c6d153e839fd71641 /pkgs/development/libraries | |
| parent | c1d62c5224a5a0212314e172abf6121c32ecd0f3 (diff) | |
| parent | f1100e94e1b94327cdf8233dedb7065009b75e6f (diff) | |
| download | nixlib-efbd28f277f6a5596e4631d59af486143999814e.tar nixlib-efbd28f277f6a5596e4631d59af486143999814e.tar.gz nixlib-efbd28f277f6a5596e4631d59af486143999814e.tar.bz2 nixlib-efbd28f277f6a5596e4631d59af486143999814e.tar.lz nixlib-efbd28f277f6a5596e4631d59af486143999814e.tar.xz nixlib-efbd28f277f6a5596e4631d59af486143999814e.tar.zst nixlib-efbd28f277f6a5596e4631d59af486143999814e.zip | |
Merge pull request #131260 from SquarePear/ffmpeg-full
ffmpeg-full: enable libdrm
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 98d8ef434e06..432fcdff9377 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -74,6 +74,7 @@ , libcaca ? null # Textual display (ASCII art) #, libcdio-paranoia ? null # Audio CD grabbing , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) +, libdrm ? null # libdrm support , libiconv ? null #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) , libmfx ? null # Hardware acceleration vis libmfx @@ -348,6 +349,7 @@ stdenv.mkDerivation rec { #(enableFeature (libcaca != null) "libcaca") #(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio") (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") + (enableFeature ((isLinux || isFreeBSD) && libdrm != null) "libdrm") (enableFeature (libiconv != null) "iconv") (enableFeature (libjack2 != null) "libjack") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") @@ -432,6 +434,7 @@ stdenv.mkDerivation rec { ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva + ++ optional ((isLinux || isFreeBSD) && libdrm != null) libdrm ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ] ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx |