From 9f6e6f9b31e1e97f090678623a67f858d51108b3 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Sat, 5 Jan 2019 03:31:43 +0200
Subject: [PATCH] nv-codec-headers: bring package to top-level

---
 pkgs/applications/video/handbrake/default.nix             | 8 +-------
 pkgs/development/libraries/ffmpeg-full/default.nix        | 4 +---
 .../nv-codec-headers.nix => nv-codec-headers/default.nix} | 0
 pkgs/top-level/all-packages.nix                           | 2 ++
 4 files changed, 4 insertions(+), 10 deletions(-)
 rename pkgs/development/libraries/{ffmpeg-full/nv-codec-headers.nix => nv-codec-headers/default.nix} (100%)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index bdb8630241e..07474c5e52c 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 4c1ad34f6da..2cfa4b1d3cd 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
similarity index 100%
rename from pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
rename to 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 eba2c979b42..cbc3ef44173 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 { };