Rename aja-ntv2 input to ntv2-src
This commit is contained in:
		
							parent
							
								
									7f33c8843f
								
							
						
					
					
						commit
						4490b28541
					
				@ -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 =
 | 
			
		||||
 | 
			
		||||
@ -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];
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										36
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										36
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@ -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": {
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										10
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								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;
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user