Streams-R-Us
/
ajantv2-nix
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename aja-ntv2 input to ntv2-src

This commit is contained in:
Nathan van Doorn 2023-10-17 09:47:19 +02:00
parent 7f33c8843f
commit 4490b28541
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aja-ntv2/default.nix
View File

@ -2,12 +2,12 @@
stdenv, stdenv,
lib, lib,
cmake, cmake,
aja-src, ntv2-src,
buildApps ? true, buildApps ? true,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ajantv2-dev"; name = "ajantv2-dev";
src = aja-src; src = ntv2-src;
nativeBuildInputs = [cmake]; nativeBuildInputs = [cmake];
cmakeFlags = cmakeFlags =

4
aja-ntv2/driver.nix
View File

@ -2,11 +2,11 @@
stdenv, stdenv,
nukeReferences, nukeReferences,
kernel, kernel,
aja-src, ntv2-src,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ajantv2-driver-${kernel.version}"; name = "ajantv2-driver-${kernel.version}";
src = aja-src; src = ntv2-src;
patches = [./lol.patch ./newkernels.patch]; patches = [./lol.patch ./newkernels.patch];
nativeBuildInputs = kernel.moduleBuildDependencies; nativeBuildInputs = kernel.moduleBuildDependencies;
buildInputs = [nukeReferences]; buildInputs = [nukeReferences];

36
flake.lock
View File

@ -1,21 +1,5 @@
{ {
"nodes": { "nodes": {
"aja-ntv2": {
"flake": false,
"locked": {
"lastModified": 1662565853,
"narHash": "sha256-rXjKDhQcZwAxsMjCoL21gpWeLWyIXyK/1y+78mhKgeo=",
"owner": "aja-video",
"repo": "ntv2",
"rev": "3a1e91f740e36e43a1ec74ff446a097330e87220",
"type": "github"
},
"original": {
"owner": "aja-video",
"repo": "ntv2",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -46,11 +30,27 @@
"type": "indirect" "type": "indirect"
} }
}, },
"ntv2-src": {
"flake": false,
"locked": {
"lastModified": 1662565853,
"narHash": "sha256-rXjKDhQcZwAxsMjCoL21gpWeLWyIXyK/1y+78mhKgeo=",
"owner": "aja-video",
"repo": "ntv2",
"rev": "3a1e91f740e36e43a1ec74ff446a097330e87220",
"type": "github"
},
"original": {
"owner": "aja-video",
"repo": "ntv2",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"aja-ntv2": "aja-ntv2",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"ntv2-src": "ntv2-src"
} }
}, },
"systems": { "systems": {

10
flake.nix
View File

@ -1,6 +1,6 @@
{ {
description = "AJA video card software"; description = "AJA video card software";
inputs.aja-ntv2 = { inputs.ntv2-src = {
type = "github"; type = "github";
owner = "aja-video"; owner = "aja-video";
repo = "ntv2"; repo = "ntv2";
@ -11,7 +11,7 @@
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
aja-ntv2, ntv2-src,
}: }:
( (
flake-utils.lib.eachSystem ["x86_64-linux"] (system: let flake-utils.lib.eachSystem ["x86_64-linux"] (system: let
@ -21,7 +21,7 @@
in { in {
packages.aja-ntv2-gst = pkgs.callPackage ./ntv2-gst.nix { packages.aja-ntv2-gst = pkgs.callPackage ./ntv2-gst.nix {
ajantv2 = pkgs.callPackage ./aja-ntv2/default.nix { ajantv2 = pkgs.callPackage ./aja-ntv2/default.nix {
aja-src = aja-ntv2; inherit ntv2-src;
buildApps = false; buildApps = false;
}; };
}; };
@ -36,8 +36,8 @@
}) })
// { // {
overlays.default = final: prev: { overlays.default = final: prev: {
ajantv-utils = final.callPackage ./aja-ntv2/default.nix {aja-src = aja-ntv2;}; ajantv-utils = final.callPackage ./aja-ntv2/default.nix { inherit ntv2-src; };
ajantv-driver = final.linuxPackages.callPackage ./aja-ntv2/driver.nix {aja-src = aja-ntv2;}; ajantv-driver = final.linuxPackages.callPackage ./aja-ntv2/driver.nix { inherit ntv2-src; };
aja-ntv2-gst = self.packages.${prev.system}.aja-ntv2-gst; aja-ntv2-gst = self.packages.${prev.system}.aja-ntv2-gst;
}; };
}; };