colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: koreader: build luajit from emulated stdenv, instead of grabbing it from the emulated packageset

Browse Source
This commit is contained in:
Colin 2023-08-05 09:54:14 +00:00
parent 3b5ff938ce
commit 8eb6be863a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
overlays/cross.nix
View File

@ -684,7 +684,11 @@ in {
};
koreader = (prev.koreader.override {
# fixes runtime error: luajit: ./ffi/util.lua:757: attempt to call field 'pack' (a nil value)
inherit (emulated) luajit;
# inherit (emulated) luajit;
luajit = final.luajit.override {
inherit (emulated) stdenv;
buildPackages.stdenv = emulated.stdenv; # it uses buildPackages.stdenv for HOST_CC
};
}).overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [
final.autoPatchelfHook
@ -692,7 +696,11 @@ in {
});
koreader-from-src = prev.koreader-from-src.override {
# fixes runtime error: luajit: ./ffi/util.lua:757: attempt to call field 'pack' (a nil value)
inherit (emulated) luajit;
# inherit (emulated) luajit;
luajit = final.luajit.override {
inherit (emulated) stdenv;
buildPackages.stdenv = emulated.stdenv; # it uses buildPackages.stdenv for HOST_CC
};
};
# libgweather = rmNativeInputs [ final.glib ] (prev.libgweather.override {
# # alternative to emulating python3 is to specify it in `buildInputs` instead of `nativeBuildInputs` (upstream),