Skip to content

Commit 0b301b6

Browse files
authored
dmlive: use new darwin sdk pattern, move to by-name (#354013)
2 parents cfa8f53 + 9b275ff commit 0b301b6

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed
Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
{ lib
2-
, stdenv
3-
, rustPlatform
4-
, fetchFromGitHub
5-
, pkg-config
6-
, makeWrapper
7-
, openssl
8-
, configd
9-
, Security
10-
, mpv
11-
, ffmpeg
12-
, nodejs
1+
{
2+
lib,
3+
rustPlatform,
4+
fetchFromGitHub,
5+
pkg-config,
6+
makeWrapper,
7+
openssl,
8+
mpv,
9+
ffmpeg,
10+
nodejs,
1311
}:
1412

1513
rustPlatform.buildRustPackage rec {
@@ -27,19 +25,30 @@ rustPlatform.buildRustPackage rec {
2725

2826
OPENSSL_NO_VENDOR = true;
2927

30-
nativeBuildInputs = [ pkg-config makeWrapper ];
31-
buildInputs = [ openssl ]
32-
++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ];
28+
nativeBuildInputs = [
29+
pkg-config
30+
makeWrapper
31+
];
32+
33+
buildInputs = [
34+
openssl
35+
];
3336

3437
postInstall = ''
35-
wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}"
38+
wrapProgram "$out/bin/dmlive" --prefix PATH : "${
39+
lib.makeBinPath [
40+
mpv
41+
ffmpeg
42+
nodejs
43+
]
44+
}"
3645
'';
3746

38-
meta = with lib; {
47+
meta = {
3948
description = "Tool to play and record videos or live streams with danmaku";
4049
homepage = "https://github.com/THMonster/dmlive";
41-
license = licenses.mit;
50+
license = lib.licenses.mit;
4251
mainProgram = "dmlive";
43-
maintainers = with maintainers; [ nickcao ];
52+
maintainers = with lib.maintainers; [ nickcao ];
4453
};
4554
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23967,11 +23967,6 @@ with pkgs;
2396723967

2396823968
dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { };
2396923969

23970-
dmlive = callPackage ../applications/video/dmlive {
23971-
inherit (darwin) configd;
23972-
inherit (darwin.apple_sdk.frameworks) Security;
23973-
};
23974-
2397523970
do-agent = callPackage ../servers/monitoring/do-agent { };
2397623971

2397723972
dodgy = with python3Packages; toPythonApplication dodgy;

0 commit comments

Comments
 (0)