clean darwin fix

commit 994515f3dbd3fa41c50fb5a080d584a7be365601 Author: Clément DOUIN <[email protected]> Date: Tue Oct 29 19:38:43 2024 +0100 clean commit ac3d181 Author: Clément DOUIN <[email protected]> Date: Tue Oct 29 19:25:35 2024 +0100 replace buildInputs by NIX_LDFLAGS commit 4d69fd5 Author: Clément DOUIN <[email protected]> Date: Tue Oct 29 19:06:03 2024 +0100 remove NIX_LDFLAGS commit 69a6d17 Author: Clément DOUIN <[email protected]> Date: Tue Oct 29 18:50:52 2024 +0100 use framework 11.0 commit 97ee430 Author: Clément DOUIN <[email protected]> Date: Tue Oct 29 18:19:42 2024 +0100 revert flake lock commit 61905bb Author: Clément DOUIN <[email protected]> Date: Tue Oct 29 18:01:21 2024 +0100 clean aarch64 nix conf commit 55594cc Author: Clément DOUIN <[email protected]> Date: Tue Oct 29 17:41:48 2024 +0100 replace rustls-native-certs by rustls-platform-verifier
pimalaya · Oct 29, 2024 · fecbae0 · fecbae0
1 parent ff19961
commit fecbae0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -67,6 +67,7 @@ url = "2.2"
 uuid = { version = "0.8", features = ["v4"] }
 
 [patch.crates-io]
+imap-client = { git = "https://github.com/pimalaya/imap-client" }
 email-lib = { git = "https://github.com/pimalaya/core" }
 process-lib = { git = "https://github.com/pimalaya/core" }
 secret-lib = { git = "https://github.com/pimalaya/core" }

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "CLI to manage emails";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     gitignore = {
       url = "github:hercules-ci/gitignore.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -66,30 +66,21 @@
           };
         };
 
-        aarch64-linux = {
-          aarch64-linux = {
-            rustTarget = "aarch64-unknown-linux-musl";
-          };
+        aarch64-linux.aarch64-linux = {
+          rustTarget = "aarch64-unknown-linux-musl";
         };
 
         x86_64-darwin.x86_64-darwin = {
           rustTarget = "x86_64-apple-darwin";
           mkPackage = { pkgs, ... }: package:
-            let inherit (pkgs.darwin.apple_sdk_11_0.frameworks) AppKit Cocoa CoreFoundation;
+            let inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
             in package // {
-              buildInputs = [ AppKit Cocoa CoreFoundation ];
-              NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit -F${Cocoa}/Library/Frameworks -framework Cocoa -F${CoreFoundation}/Library/Frameworks -framework CoreFoundation";
+              NIX_LDFLAGS = "-F${Security}/Library/Frameworks -framework Security";
             };
         };
 
         aarch64-darwin.aarch64-darwin = {
           rustTarget = "aarch64-apple-darwin";
-          mkPackage = { pkgs, ... }: package:
-            let inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Cocoa;
-            in package // {
-              buildInputs = [ Cocoa ];
-              NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit";
-            };
         };
       };