public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nv-codec-headers: bring package to top-level

Browse Source
This commit is contained in:
Anton-Latukha 2019-01-05 03:31:43 +02:00
parent 6ebcbd0c97
commit 9f6e6f9b31
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/handbrake/default.nix
View File

@ -7,7 +7,7 @@
# Main build tools # Main build tools
python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
# Processing, video codecs, containers # Processing, video codecs, containers
ffmpeg-full, libogg, x264, x265, libvpx, libtheora, ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora,
# Codecs, audio # Codecs, audio
libopus, lame, libvorbis, a52dec, speex, libsamplerate, libopus, lame, libvorbis, a52dec, speex, libsamplerate,
# Text processing # Text processing
@ -28,12 +28,6 @@
useFdk ? false, fdk_aac ? null useFdk ? false, fdk_aac ? null
}: }:
let
nv-codec-headers = callPackage ../../../development/libraries/ffmpeg-full/nv-codec-headers.nix { };
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.0"; version = "1.2.0";
name = "handbrake-${version}"; name = "handbrake-${version}";

4
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -96,7 +96,7 @@
, libxcbshapeExtlib ? true # X11 grabbing shape rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering
, libXv ? null # Xlib support , libXv ? null # Xlib support
, lzma ? null # xz-utils , lzma ? null # xz-utils
, nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support , nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support
, callPackage # needed for NVENC to access external ffmpeg nvidia headers , callPackage # needed for NVENC to access external ffmpeg nvidia headers
, openal ? null # OpenAL 1.1 capture support , openal ? null # OpenAL 1.1 capture support
#, opencl ? null # OpenCL code #, opencl ? null # OpenCL code
@ -176,8 +176,6 @@
let let
inherit (stdenv) isCygwin isFreeBSD isLinux; inherit (stdenv) isCygwin isFreeBSD isLinux;
inherit (stdenv.lib) optional optionals optionalString enableFeature; inherit (stdenv.lib) optional optionals optionalString enableFeature;
nv-codec-headers = callPackage ./nv-codec-headers.nix { };
in in
/* /*

0
pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix → pkgs/development/libraries/nv-codec-headers/default.nix
View File

2
pkgs/top-level/all-packages.nix
View File

@ -11774,6 +11774,8 @@ in
ntrack = callPackage ../development/libraries/ntrack { }; ntrack = callPackage ../development/libraries/ntrack { };
nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { };
nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { };