dmlive: use new darwin sdk pattern, move to by-name (#354013)

This commit is contained in:
Austin Horstman 2024-11-08 09:58:32 -06:00 committed by GitHub
commit 0b301b61e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 24 deletions

View File

@ -1,15 +1,13 @@
{ lib {
, stdenv lib,
, rustPlatform rustPlatform,
, fetchFromGitHub fetchFromGitHub,
, pkg-config pkg-config,
, makeWrapper makeWrapper,
, openssl openssl,
, configd mpv,
, Security ffmpeg,
, mpv nodejs,
, ffmpeg
, nodejs
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -27,19 +25,30 @@ rustPlatform.buildRustPackage rec {
OPENSSL_NO_VENDOR = true; OPENSSL_NO_VENDOR = true;
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [
buildInputs = [ openssl ] pkg-config
++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; makeWrapper
];
buildInputs = [
openssl
];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" wrapProgram "$out/bin/dmlive" --prefix PATH : "${
lib.makeBinPath [
mpv
ffmpeg
nodejs
]
}"
''; '';
meta = with lib; { meta = {
description = "Tool to play and record videos or live streams with danmaku"; description = "Tool to play and record videos or live streams with danmaku";
homepage = "https://github.com/THMonster/dmlive"; homepage = "https://github.com/THMonster/dmlive";
license = licenses.mit; license = lib.licenses.mit;
mainProgram = "dmlive"; mainProgram = "dmlive";
maintainers = with maintainers; [ nickcao ]; maintainers = with lib.maintainers; [ nickcao ];
}; };
} }

View File

@ -23967,11 +23967,6 @@ with pkgs;
dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { }; dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { };
dmlive = callPackage ../applications/video/dmlive {
inherit (darwin) configd;
inherit (darwin.apple_sdk.frameworks) Security;
};
do-agent = callPackage ../servers/monitoring/do-agent { }; do-agent = callPackage ../servers/monitoring/do-agent { };
dodgy = with python3Packages; toPythonApplication dodgy; dodgy = with python3Packages; toPythonApplication dodgy;