Unverified Commit 36fe9df8 authored by Alex James's avatar Alex James
Browse files

gpac: migrate to new apple-sdk pattern 

Tracked by #354146.
parent 69c085d0

pkgs/applications/video/gpac/default.nix

+1 −3
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 { };