diff options
| -rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/nv-codec-headers/default.nix (renamed from pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index bdb8630241e17..07474c5e52c59 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,7 +7,7 @@ # Main build tools python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, # Processing, video codecs, containers - ffmpeg-full, libogg, x264, x265, libvpx, libtheora, + ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, # Codecs, audio libopus, lame, libvorbis, a52dec, speex, libsamplerate, # Text processing @@ -28,12 +28,6 @@ useFdk ? false, fdk_aac ? null }: -let - - nv-codec-headers = callPackage ../../../development/libraries/ffmpeg-full/nv-codec-headers.nix { }; - -in - stdenv.mkDerivation rec { version = "1.2.0"; name = "handbrake-${version}"; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4c1ad34f6da37..2cfa4b1d3cd67 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -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-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -176,8 +176,6 @@ let inherit (stdenv) isCygwin isFreeBSD isLinux; inherit (stdenv.lib) optional optionals optionalString enableFeature; - - nv-codec-headers = callPackage ./nv-codec-headers.nix { }; in /* diff --git a/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index 03599c91bf04f..03599c91bf04f 100644 --- a/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba2c979b42f0..cbc3ef441735f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11774,6 +11774,8 @@ in ntrack = callPackage ../development/libraries/ntrack { }; + nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; + nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; |