forked from cory/tildefriends
		
	build: Nope, I don't understand nix.
This commit is contained in:
		| @@ -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) | ||||||
|   | |||||||
| @@ -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 | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user