pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mayeul d'Avezac 2022-10-04 11:23:04 +01:00 • committed by GitHub
parent 9135eceac1
commit 55cd26b278
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.nix/crate2nix.nix
View file

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

7
.nix/zellij.nix
View file

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