cory/tildefriends
5
6
Fork 2
Code Issues 36 Pull Requests 1 Actions Releases 29 Wiki Activity

build: Nope, I don't understand nix.
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 21m15s
Details

Browse Source
This commit is contained in:
Cory McWilliams 2025-01-29 20:53:09 -05:00
parent f7fb112f21
commit 697e2f2071
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -1143,7 +1143,7 @@ $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
$(LOCAL_DEPS): $(LOCAL_DEPS):
+@tools/ssl-local +@/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)): | $(LOCAL_DEPS)
ifeq ($(HAVE_CROSS_AARCH64),1) ifeq ($(HAVE_CROSS_AARCH64),1)

2
default.nix
View File

@ -36,13 +36,11 @@ pkgs.stdenv.mkDerivation rec {
bash bash
glibc glibc
gnumake gnumake
openssl
which which
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
glibc glibc
openssl
which which
]; ];

2
tools/ssl-local
View File

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