fix(nix) missing frameworks on darwin (#1724)

zellij-org · Oct 4, 2022 · 55cd26b · 55cd26b
1 parent 9135ece
commit 55cd26b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.nix/crate2nix.nix b/.nix/crate2nix.nix
@@ -13,6 +13,10 @@
     (import "${crate2nix}/tools.nix" {inherit pkgs;})
     generatedCargoNix
     ;
+  darwinBuildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [
+      pkgs.darwin.apple_sdk.frameworks.DiskArbitration
+      pkgs.darwin.apple_sdk.frameworks.Foundation
+  ];
 
   project =
     import
@@ -29,6 +33,10 @@
               # Crate dependency overrides go here
               zellij = attrs: {
                 inherit postInstall desktopItems meta name nativeBuildInputs patchPhase;
+                buildInputs = darwinBuildInputs;
+              };
+              sysinfo = attrs: {
+                buildInputs = darwinBuildInputs;
               };
             };
         };

diff --git a/.nix/zellij.nix b/.nix/zellij.nix
@@ -74,7 +74,12 @@ flake-utils.lib.eachSystem [
   buildInputs = [
     # in order to run tests
     pkgs.openssl
-  ];
+  ] ++ (
+    pkgs.lib.optionals pkgs.stdenv.isDarwin [
+          pkgs.darwin.apple_sdk.frameworks.DiskArbitration
+          pkgs.darwin.apple_sdk.frameworks.Foundation
+    ]
+   );
 
   nativeBuildInputs = [
     # for openssl/openssl-sys