diff --git a/Makefile b/Makefile index e01d88a9f7..307d7f474e 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,8 @@ endif export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG) # This has to be specified for both the Node.JS server process and the Qt process. export REACT_SERVER_PORT ?= 5001 +# Fix for ERR_OSSL_EVP_UNSUPPORTED error. +export NODE_OPTIONS += --openssl-legacy-provider # The path can be anything, but home is usually safest. export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore diff --git a/nix/mobile/android/release.nix b/nix/mobile/android/release.nix index 6cf96dbf02..c62edd1082 100644 --- a/nix/mobile/android/release.nix +++ b/nix/mobile/android/release.nix @@ -72,6 +72,9 @@ in stdenv.mkDerivation rec { ANDROID_SDK_ROOT = "${androidPkgs.sdk}"; ANDROID_NDK_ROOT = "${androidPkgs.ndk}"; + # Fix for ERR_OSSL_EVP_UNSUPPORTED error. + NODE_OPTIONS = "--openssl-legacy-provider"; + # Used by the Android Gradle build script in android/build.gradle STATUS_GO_ANDROID_LIBDIR = status-go; diff --git a/nix/overlay.nix b/nix/overlay.nix index 73c924264c..8175841d12 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -33,18 +33,19 @@ in { gradlePropParser = callPackage ./tools/gradlePropParser.nix { }; # Package version adjustments - gradle = super.pkgs.gradle_5; - nodejs = super.pkgs.nodejs-16_x; - openjdk = super.pkgs.openjdk8_headless; + gradle = super.gradle_5; + nodejs = super.nodejs-16_x; + yarn = super.yarn.override { nodejs = super.nodejs-16_x; }; + openjdk = super.openjdk8_headless; xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } { version = "13.3"; allowHigher = true; }; - go = super.pkgs.go_1_17; - buildGoPackage = super.pkgs.buildGo117Package; - buildGoModule = super.pkgs.buildGo117Module; + go = super.go_1_18; + buildGoPackage = super.buildGo118Package; + buildGoModule = super.buildGo118Module; gomobile = (super.gomobile.overrideAttrs (old: { - patches = self.pkgs.fetchurl { # https://github.com/golang/mobile/pull/84 + patches = self.fetchurl { # https://github.com/golang/mobile/pull/84 url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch"; sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y="; }; diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 835490b6b8..242636f1b4 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -13,8 +13,8 @@ let name = "nixpkgs-source"; owner = "NixOS"; repo = "nixpkgs"; - rev = "280d485b6f94d5ee8645aaf098c61a5def5df2be"; - sha256 = "sha256-8ZWWJEDypkTCrzIWUxpin7CS2M3uPjjbl/8mpcVZQ9I"; + rev = "579238da5f431b7833a9f0681663900aaf0dd1e8"; + sha256 = "sha256-cDwASlAf/h0fsHtDm9yNBHEHK0uq6do+mIUEgh1i5yg="; # To get the compressed Nix sha256, use: # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz }; diff --git a/nix/pkgs/android-sdk/compose.nix b/nix/pkgs/android-sdk/compose.nix index 525692bbc5..27f3da22c8 100644 --- a/nix/pkgs/android-sdk/compose.nix +++ b/nix/pkgs/android-sdk/compose.nix @@ -9,7 +9,7 @@ # by setting android_sdk.accept_license = true. androidenv.composeAndroidPackages { toolsVersion = "26.1.1"; - platformToolsVersion = "33.0.1"; + platformToolsVersion = "33.0.2"; buildToolsVersions = [ "31.0.0" ]; platformVersions = [ "31" ]; cmakeVersions = [ "3.18.1" ];