Update flake impl
parent
504a26ed12
commit
65fbb9c122
20
flake.nix
20
flake.nix
|
@ -27,15 +27,13 @@
|
||||||
# Configuration for `nixpkgs`
|
# Configuration for `nixpkgs`
|
||||||
nixpkgsConfig = {
|
nixpkgsConfig = {
|
||||||
config = { allowUnfree = true; };
|
config = { allowUnfree = true; };
|
||||||
overlays = attrValues self.overlays ++ singleton
|
overlays = attrValues self.overlays ++ singleton (
|
||||||
(
|
|
||||||
final: prev: optionalAttrs
|
final: prev: optionalAttrs
|
||||||
(prev.stdenv.system == "aarch64-darwin")
|
(prev.stdenv.system == "aarch64-darwin")
|
||||||
{
|
{
|
||||||
# Sub in x86 version of packages that don't build on Apple Silicon yet
|
# Sub in x86 version of packages that don't build on Apple Silicon yet
|
||||||
inherit (final.pkgs-x86);
|
inherit (final.pkgs-x86);
|
||||||
inherit (final.patched) python310 kitty;
|
} // final.patched
|
||||||
}
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -171,19 +169,7 @@
|
||||||
system = "x86_64-darwin";
|
system = "x86_64-darwin";
|
||||||
inherit (nixpkgsConfig) config;
|
inherit (nixpkgsConfig) config;
|
||||||
};
|
};
|
||||||
patched = {
|
patched = { };
|
||||||
python310 = prev.python310.override {
|
|
||||||
packageOverrides = python-self: python-super: {
|
|
||||||
pyopenssl = python-super.pyopenssl.overrideAttrs (_: {
|
|
||||||
meta.broken = false;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
|
||||||
kitty = prev.kitty.overrideAttrs (_: {
|
|
||||||
doCheck = false;
|
|
||||||
doInstallCheck = false;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue