diff options
| author | Mayeul d'Avezac <2745737+mdavezac@users.noreply.github.com> | 2022-10-04 11:23:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 12:23:04 +0200 |
| commit | 55cd26b278238b27ddc5b4f372f55b5ebaaa0db2 (patch) | |
| tree | 9c390156d7968b0066c7ad0ae8cd47fad9ff3a44 | |
| parent | 9135eceac166066f440ce353982b8129689a5159 (diff) | |
fix(nix) missing frameworks on darwin (#1724)
| -rw-r--r-- | .nix/crate2nix.nix | 8 | ||||
| -rw-r--r-- | .nix/zellij.nix | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/.nix/crate2nix.nix b/.nix/crate2nix.nix index 1d7d7ff14..a127a8d30 100644 --- 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 index 07c0f5c18..05ed07b70 100644 --- 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 |