From 36fe9df8f0803ee742ff64907d119d58ffea7c3b Mon Sep 17 00:00:00 2001 From: Alex James Date: Mon, 11 Nov 2024 16:53:06 -0600 Subject: [PATCH] gpac: migrate to new apple-sdk pattern Tracked by #354146. --- pkgs/applications/video/gpac/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index b036e69ce8a39..8cd33a1b578f6 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }: +{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, zlib }: stdenv.mkDerivation rec { pname = "gpac"; @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6b62ab86648a..bee27bb2f528e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9582,9 +9582,7 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpac = callPackage ../applications/video/gpac { - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + gpac = callPackage ../applications/video/gpac { }; gpgme = callPackage ../development/libraries/gpgme { };