From 15fa96fd94a320812aa0c6d20821b2ce931ab14d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:09:04 +0100 Subject: [PATCH] vapoursynth: use new darwin sdk pattern --- pkgs/by-name/va/vapoursynth/package.nix | 27 +++++++++---------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix index 88f341bfb699..fe2abaace074 100644 --- a/pkgs/by-name/va/vapoursynth/package.nix +++ b/pkgs/by-name/va/vapoursynth/package.nix @@ -12,9 +12,7 @@ zimg, libass, python3, - libiconv, testers, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -33,21 +31,16 @@ stdenv.mkDerivation rec { autoreconfHook makeWrapper ]; - buildInputs = - [ - zimg - libass - (python3.withPackages ( - ps: with ps; [ - sphinx - cython - ] - )) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ApplicationServices - ]; + buildInputs = [ + zimg + libass + (python3.withPackages ( + ps: with ps; [ + sphinx + cython + ] + )) + ]; enableParallelBuilding = true; doInstallCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f49620f8615..7ab0d078d7cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9051,10 +9051,6 @@ with pkgs; eigen2 = callPackage ../development/libraries/eigen/2.0.nix { }; - vapoursynth = callPackage ../by-name/va/vapoursynth/package.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; - vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; vmmlib = callPackage ../development/libraries/vmmlib {