Skip to content

Commit

Permalink
use local swift on macos
Browse files Browse the repository at this point in the history
Signed-off-by: Kristoffer Dalby <kristoffer@dalby.cc>
  • Loading branch information
kradalby committed Jul 5, 2024
1 parent 33b8619 commit baad73c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
"revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
"version" : "1.5.4"
"revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
"version" : "1.6.1"
}
},
{
"identity" : "swift-system",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system.git",
"state" : {
"revision" : "f9266c85189c2751589a50ea5aec72799797e471",
"version" : "1.3.0"
"revision" : "6a9e38e7bd22a3b8ba80bddf395623cf68f57807",
"version" : "1.3.1"
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 13 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,18 @@
else "dev";

ndeps = pkgs:
with pkgs; [
swiftPackages.swiftNoSwiftDriver
swiftPackages.swiftpm

pkg-config
];
with pkgs;
[
pkg-config
]
++ lib.optionals stdenv.isLinux [
swiftPackages.swiftNoSwiftDriver
swiftPackages.swiftpm
];

bdeps = pkgs:
with pkgs;
[
swiftPackages.stdenv
swiftPackages.XCTest
swiftPackages.Foundation
swiftPackages.Dispatch

# SwiftExif
libexif
libiptcdata
Expand Down Expand Up @@ -73,6 +70,11 @@
# and find that library in Nix and add it to the buildDeps.
]
++ lib.optionals stdenv.isLinux [
swiftPackages.stdenv
swiftPackages.XCTest
swiftPackages.Foundation
swiftPackages.Dispatch

swift-corelibs-libdispatch
glibc.dev

Expand Down

0 comments on commit baad73c

Please sign in to comment.