Unverified Commit a64cb9b6 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #325326 from al3xtjames/gpac-darwin 

gpac: add support for darwin
parents 9b429bf2 d721607e

pkgs/applications/video/gpac/default.nix

+13 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }:

{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }:



stdenv.mkDerivation rec {

  pname = "gpac";
@@ -13,9 +13,17 @@ stdenv.mkDerivation rec { 


  # this is the bare minimum configuration, as I'm only interested in MP4Box

  # For most other functionality, this should probably be extended

  nativeBuildInputs = [ pkg-config ];



  buildInputs = [ zlib ];

  nativeBuildInputs = [

    pkg-config

  ] ++ lib.optionals stdenv.isDarwin [

    cctools

  ];



  buildInputs = [

    zlib

  ] ++ lib.optionals stdenv.isDarwin [

    Carbon

  ];



  enableParallelBuilding = true;
@@ -36,6 +44,6 @@ stdenv.mkDerivation rec { 
    homepage = "https://gpac.wp.imt.fr";

    license = licenses.lgpl21;

    maintainers = with maintainers; [ bluescreen303 mgdelacroix ];

    platforms = platforms.linux;

    platforms = platforms.unix;

  };

}

pkgs/top-level/all-packages.nix

+4 −1
Original line number Diff line number Diff line
@@ -20923,7 +20923,10 @@ with pkgs; 
    autoconf = buildPackages.autoconf269;

  };













  gpac = callPackage ../applications/video/gpac { };













  gpac = callPackage ../applications/video/gpac {













    inherit (darwin) cctools;













    inherit (darwin.apple_sdk.frameworks) Carbon;













  };





























  gpgme = callPackage ../development/libraries/gpgme { };