Skip to content

Commit

Permalink
gpac: migrate to new apple-sdk pattern
Browse files Browse the repository at this point in the history
Tracked by NixOS#354146.
  • Loading branch information
al3xtjames committed Nov 11, 2024
1 parent 69c085d commit 36fe9df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions pkgs/applications/video/gpac/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }:
{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, zlib }:

stdenv.mkDerivation rec {
pname = "gpac";
Expand All @@ -21,8 +21,6 @@ stdenv.mkDerivation rec {

buildInputs = [
zlib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
];

enableParallelBuilding = true;
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down

0 comments on commit 36fe9df

Please sign in to comment.