From 8d038811099b1b9ae8fe37adcbca61fca75eef50 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 28 Aug 2023 10:06:24 +0000 Subject: [PATCH] cross compilation: disable kitty patch (no longer needed) --- overlays/cross.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index c6bbece7a..e7e51edd8 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -869,17 +869,18 @@ in { # inherit (emulated) stdenv; # }; - kitty = prev.kitty.overrideAttrs (upstream: { - # fixes: "FileNotFoundError: [Errno 2] No such file or directory: 'pkg-config'" - PKGCONFIG_EXE = "${final.buildPackages.pkg-config}/bin/${final.buildPackages.pkg-config.targetPrefix}pkg-config"; + # kitty = prev.kitty.overrideAttrs (upstream: { + # # fixes: "FileNotFoundError: [Errno 2] No such file or directory: 'pkg-config'" + # PKGCONFIG_EXE = "${final.buildPackages.pkg-config}/bin/${final.buildPackages.pkg-config.targetPrefix}pkg-config"; + + # # when building docs, kitty's setup.py invokes `sphinx`, which tries to load a .so for the host. + # # on cross compilation, that fails + # KITTY_NO_DOCS = true; + # patches = upstream.patches ++ [ + # ./kitty-no-docs.patch + # ]; + # }); - # when building docs, kitty's setup.py invokes `sphinx`, which tries to load a .so for the host. - # on cross compilation, that fails - KITTY_NO_DOCS = true; - patches = upstream.patches ++ [ - ./kitty-no-docs.patch - ]; - }); komikku = wrapGAppsHook4Fix prev.komikku; koreader = (prev.koreader.override { # fixes runtime error: luajit: ./ffi/util.lua:757: attempt to call field 'pack' (a nil value)