Compare commits

...

3 Commits

Author SHA1 Message Date
d4a5cc6eee build: Let's start work on 0.0.28.
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 19m44s
2025-01-30 12:46:52 -05:00
d19605cc8d build: Fixes nix. Now everybody is happy.
Some checks are pending
Build Tilde Friends / Build-All (push) Waiting to run
2025-01-30 12:35:43 -05:00
8d529327a4 build: Let's go back to nix trying to use its own OpenSSL.
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 19m34s
2025-01-30 12:31:12 -05:00
4 changed files with 12 additions and 10 deletions

View File

@ -16,8 +16,8 @@ MAKEFLAGS += --no-builtin-rules
## LD := Linker.
## ANDROID_SDK := Path to the Android SDK.
VERSION_CODE := 32
VERSION_NUMBER := 0.0.27
VERSION_CODE := 33
VERSION_NUMBER := 0.0.28-wip
VERSION_NAME := This program kills fascists.
SQLITE_URL := https://www.sqlite.org/2025/sqlite-amalgamation-3480000.zip
@ -35,6 +35,7 @@ BUNDLETOOL = out/bundletool.jar
HAVE_WIN := 0
HAVE_CROSS_AARCH64 := 0
USE_SYSTEM_SSL := 0
export SOURCE_DATE_EPOCH=1
export TZ=UTC
@ -1144,7 +1145,7 @@ ifeq ($(UNAME_S),Linux)
LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
$(LOCAL_DEPS):
+@/usr/bin/env bash tools/ssl-local
$(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): | $(LOCAL_DEPS)
$(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): $(if $(USE_SYSTEM_SSL), , | $(LOCAL_DEPS))
ifeq ($(HAVE_CROSS_AARCH64),1)
LOCAL_DEPS := deps/openssl/$(UNAME_S)/aarch64/usr/local/lib/libssl.a

View File

@ -21,31 +21,32 @@
}:
pkgs.stdenv.mkDerivation rec {
pname = "tildefriends";
version = "0.0.27";
version = "0.0.27.1";
src = pkgs.fetchFromGitea {
domain = "dev.tildefriends.net";
owner = "cory";
repo = "tildefriends";
rev = "v${version}";
hash = "sha256-NhoTBWYsWc206f1+M9haxHSJU6ZSGoP5nPStymAIyRk=";
hash = "sha256-3t1m9ZomQF3DteWyALJWrnCq0EAROEK8shKXh6Ao38c=";
fetchSubmodules = true;
};
nativeBuildInputs = with pkgs; [
bash
glibc
gnumake
openssl
which
];
buildInputs = with pkgs; [
glibc
openssl
which
];
buildPhase = ''
make -j $NIX_BUILD_CORES release
make -j $NIX_BUILD_CORES release USE_SYSTEM_SSL=1
'';
installPhase = ''

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.unprompted.tildefriends"
android:versionCode="32"
android:versionName="0.0.27">
android:versionCode="33"
android:versionName="0.0.28-wip">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<application

View File

@ -1,2 +1,2 @@
#define VERSION_NUMBER "0.0.27"
#define VERSION_NUMBER "0.0.28-wip"
#define VERSION_NAME "This program kills fascists."