Skip to content

Commit

Permalink
Merge pull request #325242 from flokli/revert-nv-codec-headers
Browse files Browse the repository at this point in the history
Revert "nv-codec-headers: recreate under by-name"
  • Loading branch information
flokli authored Jul 7, 2024
2 parents f99e3f2 + 2cf621a commit 4685e6f
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 84 deletions.
38 changes: 0 additions & 38 deletions pkgs/by-name/nv/nv-codec-headers/package.nix

This file was deleted.

42 changes: 0 additions & 42 deletions pkgs/by-name/nv/nv-codec-headers/sources.nix

This file was deleted.

32 changes: 32 additions & 0 deletions pkgs/development/libraries/nv-codec-headers/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ lib
, fetchgit
, stdenvNoCC
}:

let
make-nv-codec-headers = (import ./make-nv-codec-headers.nix) {
inherit lib fetchgit stdenvNoCC;
};
in
{
nv-codec-headers-8 = make-nv-codec-headers {
version = "8.2.15.2";
hash = "sha256-TKYT8vXqnUpq+M0grDeOR37n/ffqSWDYTrXIbl++BG4=";
};
nv-codec-headers-9 = make-nv-codec-headers {
version = "9.1.23.1";
hash = "sha256-kF5tv8Nh6I9x3hvSAdKLakeBVEcIiXFY6o6bD+tY2/U=";
};
nv-codec-headers-10 = make-nv-codec-headers {
version = "10.0.26.2";
hash = "sha256-BfW+fmPp8U22+HK0ZZY6fKUjqigWvOBi6DmW7SSnslg=";
};
nv-codec-headers-11 = make-nv-codec-headers {
version = "11.1.5.2";
hash = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk=";
};
nv-codec-headers-12 = make-nv-codec-headers {
version = "12.1.14.0";
hash = "sha256-WJYuFmMGSW+B32LwE7oXv/IeTln6TNEeXSkquHh85Go=";
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ lib
, stdenvNoCC
, fetchgit
}:

{ pname ? "nv-codec-headers"
, version
, hash
}:

stdenvNoCC.mkDerivation {
inherit pname version;

src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}";
inherit hash;
};

makeFlags = [
"PREFIX=$(out)"
];

meta = {
description = "FFmpeg version of headers for NVENC";
homepage = "https://ffmpeg.org/";
downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
}
14 changes: 10 additions & 4 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23351,10 +23351,16 @@ with pkgs;
nuspell = callPackage ../development/libraries/nuspell { };
nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; };

nv-codec-headers-9 = nv-codec-headers.override { majorVersion = "9"; };
nv-codec-headers-10 = nv-codec-headers.override { majorVersion = "10"; };
nv-codec-headers-11 = nv-codec-headers.override { majorVersion = "11"; };
nv-codec-headers-12 = nv-codec-headers.override { majorVersion = "12"; };
# splicing magic
nv-codec-headers-versions = callPackages ../development/libraries/nv-codec-headers { };
inherit (nv-codec-headers-versions)
nv-codec-headers-9
nv-codec-headers-10
nv-codec-headers-11
nv-codec-headers-12
;
# A default nv-codec-headers to make people happy
nv-codec-headers = nv-codec-headers-versions.nv-codec-headers-9;

nvidiaCtkPackages =
callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix
Expand Down

0 comments on commit 4685e6f

Please sign in to comment.