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

Compare commits

base: Streams-R-Us:eb4b9b38d1091755c4c12a1b0e9a5e5c7e2ceb16
Branches Tags
Streams-R-Us:main
Streams-R-Us:samwtest
...
compare: Streams-R-Us:9e1beef1c8b00e60f34f53de153273a91dd1128f
Branches Tags
Streams-R-Us:main
Streams-R-Us:samwtest

6 Commits
eb4b9b38d1 ... 9e1beef1c8

Author SHA1 Message Date
Sam W 9e1beef1c8 Move ntv2 src to a flake input 2023-10-13 20:56:15 +01:00
Sam W 2cbc0594f6
Merge pull request #1 from streams-r-us/misc-nix-cleanup-20231013 
Various minor nix refactoring
 2023-10-13 20:39:40 +01:00
Nathan van Doorn ecaa46a18b use callPackage for deps in another place too 2023-10-13 19:28:06 +02:00
Nathan van Doorn 2b2d63f1c5 Remove unnessasary parens 2023-10-13 19:04:54 +02:00
Nathan van Doorn c82334aae1 Notice that flake-utils is in the flakes registry 2023-10-13 19:03:00 +02:00
Nathan van Doorn 2851d85d3d Use callPackage machinery for dependency resolution a bit more 2023-10-13 19:02:39 +02:00
6 changed files with 75 additions and 46 deletions
Show Stats Expand all files Collapse all files

8
aja-ntv2/default.nix
View File

@ -1,14 +1,14 @@
{
stdenv,
callPackage,
lib,
pkgs,
cmake,
aja-src,
buildApps ? true,
}:
stdenv.mkDerivation {
name = "ajantv2-dev";
src = callPackage ./src.nix {};
nativeBuildInputs = [pkgs.cmake];
src = aja-src;
nativeBuildInputs = [cmake];
cmakeFlags =
[

4
aja-ntv2/driver.nix
View File

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

6
aja-ntv2/src.nix
View File

@ -1,6 +0,0 @@
{ pkgs }: pkgs.fetchFromGitHub {
owner = "aja-video";
repo = "ntv2";
rev = "refs/heads/main";
hash = "sha256-rXjKDhQcZwAxsMjCoL21gpWeLWyIXyK/1y+78mhKgeo=";
}

56
flake.lock
View File

@ -1,5 +1,38 @@
{
"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"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1694499547,
@ -15,8 +48,9 @@
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"utils": "utils"
"aja-ntv2": "aja-ntv2",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
@ -33,24 +67,6 @@
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

39
flake.nix
View File

@ -1,27 +1,42 @@
{
description = "AJA video card software";
inputs.utils.url = "github:numtide/flake-utils";
inputs.aja-ntv2 = {
url = "github:aja-video/ntv2";
flake = false;
};
outputs = {
self,
nixpkgs,
utils,
}: (
utils.lib.eachSystem ["x86_64-linux"] (system: let
flake-utils,
aja-ntv2,
}:
(
flake-utils.lib.eachSystem ["x86_64-linux"] (system: let
pkgs = import nixpkgs {
inherit system;
};
in {
packages.aja-ntv2-gst = pkgs.callPackage ./ntv2-gst.nix {
ajantv2 = pkgs.callPackage ./aja-ntv2/default.nix {
aja-src = aja-ntv2;
buildApps = false;
};
};
})
)
// flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs {
inherit system;
};
in {
packages.aja-ntv2-gst = pkgs.callPackage ./ntv2-gst.nix {
ajantv2 = pkgs.callPackage ./aja-ntv2/default.nix { buildApps = false; };
};
formatter = pkgs.alejandra;
})
) // {
overlays.default = (final: prev: {
ajantv-utils = final.callPackage ./aja-ntv2/default.nix {};
ajantv-driver = final.linuxPackages.callPackage ./aja-ntv2/driver.nix {};
// {
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;};
aja-ntv2-gst = self.packages.${prev.system}.aja-ntv2-gst;
});
};
};
}

8
ntv2-gst.nix
View File

@ -1,7 +1,11 @@
{
stdenv,
pkgs,
fetchFromGitHub,
autoconf,
automake,
pkgconfig,
libtool,
gst_all_1,
ajantv2,
}:
stdenv.mkDerivation {
@ -15,7 +19,7 @@ stdenv.mkDerivation {
sourceRoot = "source/gst-plugin";
patches = [./no.patch];
nativeBuildInputs = with pkgs; [autoconf automake pkgconfig libtool gst_all_1.gst-plugins-base ajantv2];
nativeBuildInputs = [autoconf automake pkgconfig libtool gst_all_1.gst-plugins-base ajantv2];
GST_NTV2 = "${ajantv2}/include";
preConfigure = ''
./autogen.sh