From 697e2f2071eff33e28736929e219f0d2b1c8cabc Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 29 Jan 2025 20:53:09 -0500 Subject: [PATCH] build: Nope, I don't understand nix. --- GNUmakefile | 2 +- default.nix | 2 -- tools/ssl-local | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index d13da871..a755d3cc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1143,7 +1143,7 @@ $(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 + +@/usr/bin/env bash tools/ssl-local $(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): | $(LOCAL_DEPS) ifeq ($(HAVE_CROSS_AARCH64),1) diff --git a/default.nix b/default.nix index 4d6068bf..465f2889 100644 --- a/default.nix +++ b/default.nix @@ -36,13 +36,11 @@ pkgs.stdenv.mkDerivation rec { bash glibc gnumake - openssl which ]; buildInputs = with pkgs; [ glibc - openssl which ]; diff --git a/tools/ssl-local b/tools/ssl-local index d6dfc282..1a87d7c8 100755 --- a/tools/ssl-local +++ b/tools/ssl-local @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# + BUILD_PLATFORM=$(uname -s) if [[ -z $BUILD_TARGET ]]; then BUILD_TARGET=$(uname -m)