4 Commits

Author SHA1 Message Date
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
697e2f2071 build: Nope, I don't understand nix.
Some checks failed
Build Tilde Friends / Build-All (push) Failing after 1m40s
2025-01-29 20:53:09 -05:00
f7fb112f21 build: I don't understand this nix error.
Some checks are pending
Build Tilde Friends / Build-All (push) Waiting to run
2025-01-29 20:32:35 -05:00
b2c0211190 build: nix?
Some checks failed
Build Tilde Friends / Build-All (push) Has been cancelled
2025-01-29 20:28:26 -05:00
3 changed files with 7 additions and 6 deletions

View File

@ -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
@ -1143,8 +1144,8 @@ $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)
ifeq ($(UNAME_S),Linux)
LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
$(LOCAL_DEPS):
+@tools/ssl-local
$(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): | $(LOCAL_DEPS)
+@/usr/bin/env bash tools/ssl-local
$(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,14 +21,14 @@
}:
pkgs.stdenv.mkDerivation rec {
pname = "tildefriends";
version = "0.0.26";
version = "0.0.27";
src = pkgs.fetchFromGitea {
domain = "dev.tildefriends.net";
owner = "cory";
repo = "tildefriends";
rev = "v${version}";
hash = "sha256-XJ7M++risfsRn9GkS1zjTQpqqV5S09uyimeVzU9hGGg=";
hash = "sha256-NhoTBWYsWc206f1+M9haxHSJU6ZSGoP5nPStymAIyRk=";
fetchSubmodules = true;
};
@ -46,7 +46,7 @@ pkgs.stdenv.mkDerivation rec {
];
buildPhase = ''
make -j $NIX_BUILD_CORES release
make -j $NIX_BUILD_CORES release USE_SYSTEM_SSL=1
'';
installPhase = ''

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
BUILD_PLATFORM=$(uname -s)
if [[ -z $BUILD_TARGET ]]; then