diff --git a/pkgs/additional/koreader-from-src/default.nix b/pkgs/additional/koreader-from-src/default.nix index ed09e3e2..1ae3877e 100644 --- a/pkgs/additional/koreader-from-src/default.nix +++ b/pkgs/additional/koreader-from-src/default.nix @@ -41,7 +41,11 @@ stdenv.mkDerivation rec { inherit name; leaveDotGit = true; # maybe not needed, but we'd need another way to query the rev during build process below 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 ); diff --git a/pkgs/additional/koreader-from-src/sources.nix b/pkgs/additional/koreader-from-src/sources.nix index 3c487901..234a9d81 100644 --- a/pkgs/additional/koreader-from-src/sources.nix +++ b/pkgs/additional/koreader-from-src/sources.nix @@ -15,15 +15,20 @@ rev = "6a1e5ba1c9ef81c205a4b270c3f121a1e106f4fc"; hash = "sha256-H0HWR+hpAYLGbBdY3BwxgKPUrWhrIsVMnoURdbn8iIE="; }; - # fbink = { # weird nix/git clone error? - # url = "https://github.com/NiLuJe/FBInk.git"; - # rev = "f562bc15a606524694a6d885bed5d83d03c7eb23"; - # }; - # freetype2 = { # weird nix/git clone error? - # url = "https://gitlab.com/koreader/freetype2.git"; - # # rev = "VER-2-13-1"; - # rev = "e4586d960f339cf75e2e0b34aee30a0ed8353c0d"; - # }; + fbink = { + url = "https://github.com/NiLuJe/FBInk.git"; + rev = "f562bc15a606524694a6d885bed5d83d03c7eb23"; + hash = "sha256-JlanCl4XQBFnrpRIEsowSeUI7wSa9RoQc5h3pkMHXA8="; + leaveDotGit = false; + deepClone = false; + }; + 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 = { url = "https://github.com/fribidi/fribidi.git"; rev = "tags/v1.0.12";