Skip to content

Commit

Permalink
Merge pull request NixOS#325326 from al3xtjames/gpac-darwin
Browse files Browse the repository at this point in the history
gpac: add support for darwin
  • Loading branch information
Aleksanaa authored Jul 11, 2024
2 parents 9b429bf + d721607 commit a64cb9b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
18 changes: 13 additions & 5 deletions pkgs/applications/video/gpac/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }:
{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }:

stdenv.mkDerivation rec {
pname = "gpac";
Expand All @@ -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;

Expand All @@ -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;
};
}
5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down

0 comments on commit a64cb9b

Please sign in to comment.