From ea68825987be8cac5face99ff8caa8665019cb9a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Nov 2024 07:56:32 -0500 Subject: [PATCH] dmlive: use new darwin sdk pattern --- pkgs/applications/video/dmlive/default.nix | 6 +----- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 5127dba204fc..bd01e1bcc4d2 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -1,12 +1,9 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , pkg-config , makeWrapper , openssl -, configd -, Security , mpv , ffmpeg , nodejs @@ -28,8 +25,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; + buildInputs = [ openssl ]; postInstall = '' wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55b0e0397a14..d838013ae783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23976,10 +23976,7 @@ with pkgs; dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { }; - dmlive = callPackage ../applications/video/dmlive { - inherit (darwin) configd; - inherit (darwin.apple_sdk.frameworks) Security; - }; + dmlive = callPackage ../applications/video/dmlive { }; do-agent = callPackage ../servers/monitoring/do-agent { };