koreader-from-src: enable freetype2, fbink sources
it seems we still check out submodules even if deepClone is false?
This commit is contained in:
parent
0be20351a1
commit
f95c45fb8e
|
@ -41,7 +41,11 @@ stdenv.mkDerivation rec {
|
||||||
inherit name;
|
inherit name;
|
||||||
leaveDotGit = true; # maybe not needed, but we'd need another way to query the rev during build process below
|
leaveDotGit = true; # maybe not needed, but we'd need another way to query the rev during build process below
|
||||||
deepClone = true; # probably not needed
|
deepClone = true; # probably not needed
|
||||||
} // src
|
} // src // {
|
||||||
|
# koreader sometimes specifies the rev as `tags/FOO`.
|
||||||
|
# we need to remember that to place the repo where it expects, but we have to strip it here for fetchgit to succeed.
|
||||||
|
rev = lib.removePrefix "tags/" src.rev;
|
||||||
|
}
|
||||||
))
|
))
|
||||||
sources.thirdparty
|
sources.thirdparty
|
||||||
);
|
);
|
||||||
|
|
|
@ -15,15 +15,20 @@
|
||||||
rev = "6a1e5ba1c9ef81c205a4b270c3f121a1e106f4fc";
|
rev = "6a1e5ba1c9ef81c205a4b270c3f121a1e106f4fc";
|
||||||
hash = "sha256-H0HWR+hpAYLGbBdY3BwxgKPUrWhrIsVMnoURdbn8iIE=";
|
hash = "sha256-H0HWR+hpAYLGbBdY3BwxgKPUrWhrIsVMnoURdbn8iIE=";
|
||||||
};
|
};
|
||||||
# fbink = { # weird nix/git clone error?
|
fbink = {
|
||||||
# url = "https://github.com/NiLuJe/FBInk.git";
|
url = "https://github.com/NiLuJe/FBInk.git";
|
||||||
# rev = "f562bc15a606524694a6d885bed5d83d03c7eb23";
|
rev = "f562bc15a606524694a6d885bed5d83d03c7eb23";
|
||||||
# };
|
hash = "sha256-JlanCl4XQBFnrpRIEsowSeUI7wSa9RoQc5h3pkMHXA8=";
|
||||||
# freetype2 = { # weird nix/git clone error?
|
leaveDotGit = false;
|
||||||
# url = "https://gitlab.com/koreader/freetype2.git";
|
deepClone = false;
|
||||||
# # rev = "VER-2-13-1";
|
};
|
||||||
# rev = "e4586d960f339cf75e2e0b34aee30a0ed8353c0d";
|
freetype2 = {
|
||||||
# };
|
url = "https://gitlab.com/koreader/freetype2.git";
|
||||||
|
rev = "VER-2-13-1";
|
||||||
|
hash = "sha256-rQN+hRzrs+KGgp8+n1VJzOOwtKUcRuSE/s/r8/xOUdI=";
|
||||||
|
leaveDotGit = false;
|
||||||
|
deepClone = false;
|
||||||
|
};
|
||||||
fribidi = {
|
fribidi = {
|
||||||
url = "https://github.com/fribidi/fribidi.git";
|
url = "https://github.com/fribidi/fribidi.git";
|
||||||
rev = "tags/v1.0.12";
|
rev = "tags/v1.0.12";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user