remove python.pkgs.cryptography as it doesn't cross compile (yet)
This commit is contained in:
@@ -8,6 +8,7 @@
|
|||||||
{
|
{
|
||||||
sane.programs.mpv = {
|
sane.programs.mpv = {
|
||||||
package = pkgs.wrapMpv pkgs.mpv-unwrapped {
|
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; [
|
scripts = with pkgs.mpvScripts; [
|
||||||
mpris
|
mpris
|
||||||
# uosc
|
# uosc
|
||||||
|
@@ -1008,9 +1008,11 @@ in {
|
|||||||
# ];
|
# ];
|
||||||
# });
|
# });
|
||||||
|
|
||||||
cryptography = py-prev.cryptography.override {
|
# 2023/08/03: fix is in staging:
|
||||||
inherit (emulated) cargo rustc rustPlatform; # "cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option ‘-m64’"
|
# - <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: {
|
# defcon = py-prev.defcon.overridePythonAttrs (orig: {
|
||||||
# nativeBuildInputs = orig.nativeBuildInputs ++ orig.nativeCheckInputs;
|
# nativeBuildInputs = orig.nativeBuildInputs ++ orig.nativeCheckInputs;
|
||||||
|
@@ -7,4 +7,23 @@
|
|||||||
# this means we lose firewire support (oh well..?)
|
# this means we lose firewire support (oh well..?)
|
||||||
ffadoSupport = false;
|
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
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user