diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
| commit | ff42d23313880d627c7dea5addf744db4562dee5 (patch) | |
| tree | c9b37f000821c6e8e2e39d983ce8ea25a56e949c /pkgs/top-level/all-packages.nix | |
| parent | 798690dc6b55c17705f9f2faab07d5b86b6d50d4 (diff) | |
| parent | 9ea3a3cfaa995c201b68c1cd3877bd35e1d7dd04 (diff) | |
| download | nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.gz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.bz2 nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.lz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.xz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.zst nixlib-ff42d23313880d627c7dea5addf744db4562dee5.zip | |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/dbt-core/default.nix pkgs/development/python-modules/dbt-semantic-interfaces/default.nix Still broken by pydantic 2 bump, though.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 649ed7e48b04..4be6b2ead562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31874,7 +31874,9 @@ with pkgs; feishu = callPackage ../applications/networking/instant-messengers/feishu { }; - filezilla = callPackage ../applications/networking/ftp/filezilla { }; + filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla { + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices Security; + }; fire = darwin.apple_sdk_11_0.callPackage ../applications/audio/fire { inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices DiscRecording CoreAudioKit MetalKit; |