diff --git a/etc/nix/shell.nix b/etc/nix/shell.nix index cc34521..e747bdb 100644 --- a/etc/nix/shell.nix +++ b/etc/nix/shell.nix @@ -117,12 +117,16 @@ let ; sha256 = "1x6lll81z4ah732zwpw481qfbzg7yml0nwdgbnd5388jnz3274ym" ; } + +; lolnero-rev = "24a98e29" +; lolnero-sha256 = "11785gjdmx9a2x3g2k9h4fhpnff16xn397qvazm9dv5gpdqmraci" + ; lolnero-source = nixpkgs.fetchgit { url = "https://gitlab.com/fuwa/lolnero.git" - ; rev = "e4d8418" - ; sha256 = "1lva8aix7ldibyd5852gcxp1isvalylc2mcc5r5wvgcqwijc3953" + ; rev = lolnero-rev + ; sha256 = lolnero-sha256 ; fetchSubmodules = false ; } @@ -194,6 +198,7 @@ with nixpkgs; export SRC_SODIUM=${sodium-source} export SRC_RAPIDJSON_DIR=${nixpkgs.rapidjson.src} export SRC_LOLNERO_DIR=${lolnero-source} + export VERSIONTAG_LOLNERO=${lolnero-rev} export PATH_NCURSES=${nixpkgs.ncurses5} export PATH diff --git a/etc/scripts/build-external-libs/lolnero/build.sh b/etc/scripts/build-external-libs/lolnero/build.sh index 970e4c1..1460c28 100755 --- a/etc/scripts/build-external-libs/lolnero/build.sh +++ b/etc/scripts/build-external-libs/lolnero/build.sh @@ -89,6 +89,7 @@ for arch in ${archs[@]}; do -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${TOOLCHAIN_DIR}" \ -D CMAKE_ANDROID_ARCH_ABI="arm64-v8a" \ -D USE_CCACHE=ON \ + -D VERSIONTAG="${VERSIONTAG_LOLNERO}" \ ../.. && make -j${NPROC} daemon ) popd