Compare commits

..

3 commits

Author SHA1 Message Date
eac4ef8313 flake.lock: Update
Some checks failed
EVAL aarch64-linux.sisko
BUILD aarch64-linux.sisko
UPLOAD aarch64-linux.sisko
DOWNLOAD aarch64-linux.sisko
CACHIX aarch64-linux.sisko
ATTIC aarch64-linux.sisko
/ test (push) Successful in 16m49s
Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41' (2024-08-10)
  → 'github:ryantm/agenix/e600439ec4c273cf11e06fe4d9d906fb98fa097c' (2025-01-15)
• Updated input 'catppuccin':
    'github:catppuccin/nix/8eada392fd6571a747e1c5fc358dd61c14c8704e' (2025-01-05)
  → 'github:catppuccin/nix/4f56f4da1d6927eca769b78b1e22fcefd5ffaa73' (2025-03-10)
• Removed input 'catppuccin/catppuccin-v1_1'
• Removed input 'catppuccin/catppuccin-v1_2'
• Removed input 'catppuccin/home-manager'
• Removed input 'catppuccin/home-manager/nixpkgs'
• Removed input 'catppuccin/home-manager-stable'
• Removed input 'catppuccin/home-manager-stable/nixpkgs'
• Updated input 'catppuccin/nixpkgs':
    'github:NixOS/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33' (2024-12-17)
  → 'github:NixOS/nixpkgs/10069ef4cf863633f57238f179a0297de84bd8d3' (2025-03-06)
• Removed input 'catppuccin/nixpkgs-stable'
• Removed input 'catppuccin/nuscht-search'
• Removed input 'catppuccin/nuscht-search/flake-utils'
• Removed input 'catppuccin/nuscht-search/flake-utils/systems'
• Removed input 'catppuccin/nuscht-search/ixx'
• Removed input 'catppuccin/nuscht-search/ixx/flake-utils'
• Removed input 'catppuccin/nuscht-search/ixx/nixpkgs'
• Removed input 'catppuccin/nuscht-search/nixpkgs'
• Updated input 'disko':
    'github:nix-community/disko/f720e64ec37fa16ebba6354eadf310f81555cc07' (2025-01-12)
  → 'github:nix-community/disko/2db1d64fc084b1d15e3871dffc02c62a94ed6ed7' (2025-03-11)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/244a2ab1459c72bac32a2db088549f8bc6d7a836' (2025-01-13)
  → 'github:nix-community/emacs-overlay/04892169ec614a3ddeb1ca4a8e6a86e9d410d30c' (2025-03-11)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/130595eba61081acde9001f43de3248d8888ac4a' (2025-01-10)
  → 'github:NixOS/nixpkgs/e3e32b642a31e6714ec1b712de8c91a3352ce7e1' (2025-03-09)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/1dab772dd4a68a7bba5d9460685547ff8e17d899' (2025-01-10)
  → 'github:NixOS/nixpkgs/ebe2788eafd539477f83775ef93c3c7e244421d3' (2025-03-10)
• Updated input 'flakeParts':
    'github:hercules-ci/flake-parts/b905f6fc23a9051a6e1b741e1438dbfc0634c6de' (2025-01-06)
  → 'github:hercules-ci/flake-parts/f4330d22f1c5d2ba72d3d22df5597d123fdb60a9' (2025-03-07)
• Updated input 'flakeParts/nixpkgs-lib':
    'e9b5173191.tar.gz?narHash=sha256-CewEm1o2eVAnoqb6Ml%2BQi9Gg/EfNAxbRx1lANGVyoLI%3D' (2025-01-01)
  → 'github:nix-community/nixpkgs.lib/147dee35aab2193b174e4c0868bd80ead5ce755c' (2025-03-02)
• Updated input 'git-hooks-nix':
    'github:cachix/git-hooks.nix/a5a961387e75ae44cc20f0a57ae463da5e959656' (2025-01-03)
  → 'github:cachix/git-hooks.nix/b5a62751225b2f62ff3147d0a334055ebadcd5cc' (2025-03-07)
• Updated input 'homeManager':
    'github:nix-community/home-manager/9616d81f98032d1ee9bec68ab4b6a8c833add88c' (2025-01-13)
  → 'github:nix-community/home-manager/c630dfa8abcc65984cc1e47fb25d4552c81dd37e' (2025-03-11)
• Updated input 'impermanence':
    'github:nix-community/impermanence/c64bed13b562fc3bb454b48773d4155023ac31b7' (2025-01-12)
  → 'github:nix-community/impermanence/4b3e914cdf97a5b536a889e939fb2fd2b043a170' (2025-01-25)
• Updated input 'lanzaboote':
    'github:nix-community/lanzaboote/93e6f0d77548be8757c11ebda5c4235ef4f3bc67' (2024-12-23)
  → 'github:nix-community/lanzaboote/d8099586d9a84308ffedac07880e7f07a0180ff4' (2025-03-08)
• Updated input 'lanzaboote/crane':
    'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28' (2024-11-08)
  → 'github:ipetkov/crane/75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53' (2025-03-05)
• Updated input 'lanzaboote/flake-compat':
    'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
  → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04)
• Updated input 'lanzaboote/flake-parts':
    'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01)
  → 'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764' (2025-03-01)
• Updated input 'lanzaboote/pre-commit-hooks-nix':
    'github:cachix/pre-commit-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0' (2024-11-11)
  → 'github:cachix/pre-commit-hooks.nix/42b1ba089d2034d910566bf6b40830af6b8ec732' (2025-03-02)
• Removed input 'lanzaboote/pre-commit-hooks-nix/nixpkgs-stable'
• Updated input 'lanzaboote/rust-overlay':
    'github:oxalica/rust-overlay/0be641045af6d8666c11c2c40e45ffc9667839b5' (2024-11-18)
  → 'github:oxalica/rust-overlay/38e9826bc4296c9daf18bc1e6aa299f3e932a403' (2025-03-06)
• Updated input 'lix':
    'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=38dd196b03f4163ae3bbb2a1910b8f0f141ca0e2' (2025-01-12)
  → 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=be1491fa6aef638e0147b81ff172131d6db668d9' (2025-03-11)
• Updated input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea' (2024-12-06)
  → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e' (2025-01-29)
• Updated input 'mobile-nixos':
    'github:NixOS/mobile-nixos/72a0601f36a1b424e8b72f17ff53509b990ee060' (2025-01-11)
  → 'github:NixOS/mobile-nixos/8956d72cf8fa9110dcc5fcbc537adee45a8014f5' (2025-03-04)
• Updated input 'nixosHardware':
    'github:NixOS/nixos-hardware/8870dcaff63dfc6647fb10648b827e9d40b0a337' (2025-01-09)
  → 'github:NixOS/nixos-hardware/b48cc4dab0f9711af296fc367b6108cf7b8ccb16' (2025-03-07)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/13c913f5deb3a5c08bb810efd89dc8cb24dd968b' (2025-01-06)
  → 'github:numtide/treefmt-nix/3d0579f5cc93436052d94b73925b48973a104204' (2025-02-17)
2025-03-11 15:15:40 +00:00
54e15511e8
Package mali-panthor-g610-firmware
Some checks failed
EVAL aarch64-linux.sisko
BUILD aarch64-linux.sisko
UPLOAD aarch64-linux.sisko
DOWNLOAD aarch64-linux.sisko
CACHIX aarch64-linux.sisko
ATTIC aarch64-linux.sisko
/ test (push) Successful in 44s
2025-03-10 19:02:19 +01:00
db2143289c
Package ffmpeg-rockchip 2025-03-10 19:02:08 +01:00
3 changed files with 203 additions and 22 deletions

44
flake.lock generated
View file

@ -26,11 +26,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1741521711,
"narHash": "sha256-uV+olxh2H8GrB676m8lHpDujYVJ1K5rie6Y0GEFSMhI=",
"lastModified": 1741641627,
"narHash": "sha256-AkMboWm5a666QLh8ioLJaZlaee7oBOvkbjZZSVTU17Q=",
"owner": "catppuccin",
"repo": "nix",
"rev": "62424ccd65e280f3739754e0f30b85c901f6bcd9",
"rev": "4f56f4da1d6927eca769b78b1e22fcefd5ffaa73",
"type": "github"
},
"original": {
@ -83,11 +83,11 @@
]
},
"locked": {
"lastModified": 1740485968,
"narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
"lastModified": 1741684000,
"narHash": "sha256-NQykaWIrn5zilncefIvW4jPQ76YMXVK/dMTzkSVDmdk=",
"owner": "nix-community",
"repo": "disko",
"rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
"rev": "2db1d64fc084b1d15e3871dffc02c62a94ed6ed7",
"type": "github"
},
"original": {
@ -122,11 +122,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1741598508,
"narHash": "sha256-t6EgzsVKgJ/3AbdChpNMzzQxk30/F67r3UaQueO2NB4=",
"lastModified": 1741692101,
"narHash": "sha256-2oLcNkpB39KELhEUMtSxUWr+OLIsYWUsyStMz4Mft4M=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "7a25a145b8a7f455e62185af431001d70471b199",
"rev": "04892169ec614a3ddeb1ca4a8e6a86e9d410d30c",
"type": "github"
},
"original": {
@ -387,11 +387,11 @@
]
},
"locked": {
"lastModified": 1741613526,
"narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=",
"lastModified": 1741701235,
"narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3593ee59a44974b8518829a5239b2f77222e3c81",
"rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e",
"type": "github"
},
"original": {
@ -464,11 +464,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1741556509,
"narHash": "sha256-Av7lhGzOjduWaq+0Wp1xR8jlTtkyhBmSZJy1G36hNtk=",
"lastModified": 1741700536,
"narHash": "sha256-0OJER7bI6UsCFnKfKdLtgjpOTNccbN3N1dDriP4XRwA=",
"ref": "refs/heads/main",
"rev": "423a34393759d75683ed84b470239a8d8f9a84ed",
"revCount": 17628,
"rev": "be1491fa6aef638e0147b81ff172131d6db668d9",
"revCount": 17635,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -647,11 +647,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1741445498,
"narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
"lastModified": 1741600792,
"narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
"rev": "ebe2788eafd539477f83775ef93c3c7e244421d3",
"type": "github"
},
"original": {
@ -695,11 +695,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1741379970,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
"lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
"type": "github"
},
"original": {

View file

@ -0,0 +1,149 @@
# Stolen from https://github.com/nyanmisaka/ffmpeg-rockchip
{
ffmpeg-full,
fetchFromGitHub,
lib,
fetchpatch2,
gmp,
amf-headers,
libiec61883,
libavc1394,
meson,
ninja,
stdenv,
fetchurl,
cmake,
...
}:
let
ffmpeg-rockchip-version = "7.1";
rga_commit = "d7a0a485ed6c201f882c20b3a8881e801f131385";
librga-multi = stdenv.mkDerivation {
pname = "librga-multi";
version = "1.10.0";
src = fetchurl {
url = "https://github.com/JeffyCN/mirrors/archive/${rga_commit}.tar.gz";
hash = "sha256-WjNxVfLVW8axEvNmIJ0+OCeboG4LiGWwJy6fW5Mkm5Y=";
};
# In Nixpkgs, meson comes with a setup hook that overrides the configure, check, and install phases.
# https://nixos.org/manual/nixpkgs/stable/#meson
nativeBuildInputs = [
meson
ninja
];
patches = [
(fetchpatch2 {
name = "normalrga-cpp-add-10b-compact-endian-mode.patch";
url = "https://raw.githubusercontent.com/7Ji-PKGBUILDs/librga-multi/615fb730b7656ad4a0cb169bfa9a52336820f99f/normalrga-cpp-add-10b-compact-endian-mode.patch";
hash = "sha256-JvKZCBjWtkEsfx1Xsnysw9PjC3/60f1ni10tmR8fTHQ=";
})
];
meta = with lib; {
description = "Rockchip RGA User-Space Library";
license = licenses.asl20;
};
};
mpp = stdenv.mkDerivation {
pname = "mpp";
version = "1.0.8";
src = fetchFromGitHub {
owner = "rockchip-linux";
repo = "mpp";
rev = "1.0.8";
hash = "sha256-y1vWGz7VjwL02klPQWwoIh5ExpvS/vsDUHcMtMznVcI=";
};
nativeBuildInputs = [ cmake ];
configurePhase = ''
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$out
'';
buildPhase = ''
cmake --build build
'';
installPhase = ''
cmake --install build
'';
meta = with lib; {
description = "Media Process Platform (MPP)";
homepage = "https://github.com/rockchip-linux/mpp";
license = licenses.asl20;
};
};
in
(ffmpeg-full.override {
version = ffmpeg-rockchip-version; # Important! This sets the ABI.
source = fetchFromGitHub {
owner = "nyanmisaka";
repo = "ffmpeg-rockchip";
rev = "f5c7e0d63b52b4526b4251e2fcb2071f73367ed6";
hash = "sha256-JM/YCvXS49jYz4oF0Ux/aGzrRzKHrD8N/Xm99gXLcqg=";
};
withVulkan = false;
}).overrideAttrs
(old: {
pname = "ffmpeg-rockchip";
patches = [ ];
# patches = old.patches ++ [
# (fetchpatch2
# {
# name = "add-av_stream_get_first_dts-for-chromium";
# url = "https://raw.githubusercontent.com/7Ji-PKGBUILDs/ffmpeg-mpp-git/b32080c1992313df0e543440c6d70d351120fa36/add-av_stream_get_first_dts-for-chromium.patch";
# hash = "sha256-DbH6ieJwDwTjKOdQ04xvRcSLeeLP2Z2qEmqeo8HsPr4=";
# }
# )
# (fetchpatch2
# {
# name = "flvdec-handle-unknown";
# url = "https://raw.githubusercontent.com/obsproject/obs-deps/faa110d336922831b5cdc261a9559e3a2dd5db3c/deps.ffmpeg/patches/FFmpeg/0001-flvdec-handle-unknown.patch";
# hash = "sha256-WlGF9Uy89GcnY8zmh9G23bZiVJtpY32oJiec5Hl/V+8=";
# }
# )
# (fetchpatch2
# {
# name = "libaomenc-presets";
# url = "https://raw.githubusercontent.com/obsproject/obs-deps/faa110d336922831b5cdc261a9559e3a2dd5db3c/deps.ffmpeg/patches/FFmpeg/0002-libaomenc-presets.patch";
# hash = "sha256-1fFBDvsx/jHo6QXsPxDMt4Qd1VlMs1kcOyBedyMv0YM=";
# }
# )
# ];
configureFlags = old.configureFlags ++ [
"--extra-version=rockchip"
"--enable-gpl"
"--enable-version3"
"--enable-libdrm"
"--enable-rkmpp"
"--enable-rkrga"
];
doCheck = false; # TODO remove (used to get faster builds)
buildInputs = old.buildInputs ++ [
gmp
amf-headers
libiec61883
libavc1394
mpp
librga-multi
];
meta = with lib; {
homepage = "https://github.com/nyanmisaka/ffmpeg-rockchip";
license = licenses.gpl3;
};
})

View file

@ -0,0 +1,32 @@
# Stolen from https://github.com/qbisi/nixos-rockchip
{
stdenv,
fetchurl,
...
}:
stdenv.mkDerivation {
pname = "mali-panthor-g610-firmware";
version = "arch10_8";
src = fetchurl {
url = "https://gitlab.com/firefly-linux/external/libmali/-/raw/firefly/firmware/g610/mali_csffw.bin";
hash = "sha256-56C0b9Z3wy4IwLiBf9HFY8OsoBPax04XaR83O5cNu6s=";
};
dontUnpack = true;
dontPatch = true;
dontConfigure = true;
dontBuild = true;
installPhase = ''
install -Dm644 $src $out/lib/firmware/arm/mali/arch10.8/mali_csffw.bin
'';
passthru = {
compressFirmware = false;
};
}