remove python.pkgs.cryptography as it doesn't cross compile (yet)

This commit is contained in:
2023-08-04 07:19:30 +00:00
parent f3af31c727
commit 1fcfa04447
3 changed files with 25 additions and 3 deletions

View File

@@ -8,6 +8,7 @@
{
sane.programs.mpv = {
package = pkgs.wrapMpv pkgs.mpv-unwrapped {
youtubeSupport = false; #< XXX(2023/08/03): doesn't cross compile until next staging -> master merge
scripts = with pkgs.mpvScripts; [
mpris
# uosc

View File

@@ -1008,9 +1008,11 @@ in {
# ];
# });
cryptography = py-prev.cryptography.override {
inherit (emulated) cargo rustc rustPlatform; # "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option -m64"
};
# 2023/08/03: fix is in staging:
# - <https://github.com/NixOS/nixpkgs/pull/244135>
# cryptography = py-prev.cryptography.override {
# inherit (emulated) cargo rustc rustPlatform; # "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option -m64"
# };
# defcon = py-prev.defcon.overridePythonAttrs (orig: {
# nativeBuildInputs = orig.nativeBuildInputs ++ orig.nativeCheckInputs;

View File

@@ -7,4 +7,23 @@
# this means we lose firewire support (oh well..?)
ffadoSupport = false;
};
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(pySelf: pySuper: {
# TODO(2023/08/02): cryptography (a dependency of komikku -> keyring -> secretstorage -> cryptography) doesn't cross compile
# so disable it. can be re-enabled in next staging -> master merge.
# see:
# - <https://github.com/NixOS/nixpkgs/pull/245287/files>
# - <https://github.com/NixOS/nixpkgs/pull/244135>
keyring = (pySuper.keyring.override {
secretstorage = null;
jeepney = null;
}).overrideAttrs (upstream: {
postPatch = (upstream.postPatch or "") + ''
sed -i /SecretStorage/d setup.cfg
sed -i /jeepney/d setup.cfg
'';
});
})
];
})