From 4490b28541525a88869c420df3bcaa61ed3d8b89 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 17 Oct 2023 09:47:19 +0200 Subject: [PATCH] Rename aja-ntv2 input to ntv2-src --- aja-ntv2/default.nix | 4 ++-- aja-ntv2/driver.nix | 4 ++-- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 10 +++++----- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/aja-ntv2/default.nix b/aja-ntv2/default.nix index f4e2316..885aa66 100644 --- a/aja-ntv2/default.nix +++ b/aja-ntv2/default.nix @@ -2,12 +2,12 @@ stdenv, lib, cmake, - aja-src, + ntv2-src, buildApps ? true, }: stdenv.mkDerivation { name = "ajantv2-dev"; - src = aja-src; + src = ntv2-src; nativeBuildInputs = [cmake]; cmakeFlags = diff --git a/aja-ntv2/driver.nix b/aja-ntv2/driver.nix index 0c6239c..28f4165 100644 --- a/aja-ntv2/driver.nix +++ b/aja-ntv2/driver.nix @@ -2,11 +2,11 @@ stdenv, nukeReferences, kernel, - aja-src, + ntv2-src, }: stdenv.mkDerivation { name = "ajantv2-driver-${kernel.version}"; - src = aja-src; + src = ntv2-src; patches = [./lol.patch ./newkernels.patch]; nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [nukeReferences]; diff --git a/flake.lock b/flake.lock index 9f32145..45332bc 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "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": { "inputs": { "systems": "systems" @@ -46,11 +30,27 @@ "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": { "inputs": { - "aja-ntv2": "aja-ntv2", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "ntv2-src": "ntv2-src" } }, "systems": { diff --git a/flake.nix b/flake.nix index 2b57555..d36e4a8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { description = "AJA video card software"; - inputs.aja-ntv2 = { + inputs.ntv2-src = { type = "github"; owner = "aja-video"; repo = "ntv2"; @@ -11,7 +11,7 @@ self, nixpkgs, flake-utils, - aja-ntv2, + ntv2-src, }: ( flake-utils.lib.eachSystem ["x86_64-linux"] (system: let @@ -21,7 +21,7 @@ in { packages.aja-ntv2-gst = pkgs.callPackage ./ntv2-gst.nix { ajantv2 = pkgs.callPackage ./aja-ntv2/default.nix { - aja-src = aja-ntv2; + inherit ntv2-src; buildApps = false; }; }; @@ -36,8 +36,8 @@ }) // { overlays.default = final: prev: { - ajantv-utils = final.callPackage ./aja-ntv2/default.nix {aja-src = aja-ntv2;}; - ajantv-driver = final.linuxPackages.callPackage ./aja-ntv2/driver.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 { inherit ntv2-src; }; aja-ntv2-gst = self.packages.${prev.system}.aja-ntv2-gst; }; };