status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix: Remove need to pass default values in `--arg config` 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-11-15 16:26:25 +01:00
parent e38e9f1072
commit af7341447c
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -1,5 +1,5 @@
# target-os = [ 'windows' 'linux' 'macos' 'darwin' 'android' 'ios' 'all' ] # target-os = [ 'windows' 'linux' 'macos' 'darwin' 'android' 'ios' 'all' ]
{ config ? { android_sdk.accept_license = true; }, { config ? { },
nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { inherit config; }, nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { inherit config; },
pkgs ? nixpkgs-bootstrap.pkgs, pkgs ? nixpkgs-bootstrap.pkgs,
stdenv ? pkgs.stdenv, stdenv ? pkgs.stdenv,

21
nix/nixpkgs-bootstrap.nix
View File

@ -1,6 +1,8 @@
# This file controls the pinned version of nixpkgs we use for our Nix environment # This file controls the pinned version of nixpkgs we use for our Nix environment
{ config ? { android_sdk.accept_license = true; }, let
pkgs ? (import ((import <nixpkgs> { }).fetchFromGitHub { inherit (import <nixpkgs> { }) fetchFromGitHub;
defaultConfig = { android_sdk.accept_license = true; };
nixpkgsSrc = {
name = "nixpkgs-source"; name = "nixpkgs-source";
owner = "status-im"; owner = "status-im";
repo = "nixpkgs"; repo = "nixpkgs";
@ -9,8 +11,15 @@
# To get the compressed Nix sha256, use: # To get the compressed Nix sha256, use:
# nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
# The last line will be the hash. # The last line will be the hash.
})) { inherit config; } }: };
{ in {
inherit pkgs config; config ? { },
} config' ? defaultConfig // config,
pkgs ? (import (fetchFromGitHub nixpkgsSrc)) { config = config'; }
}:
{
inherit pkgs;
config = config';
}

2
nix/shell.sh
View File

@ -52,7 +52,7 @@ if [[ "$TARGET_OS" =~ (linux|windows|darwin|macos) ]]; then
fi fi
if [ -n "${STATUS_GO_SRC_OVERRIDE}" ]; then if [ -n "${STATUS_GO_SRC_OVERRIDE}" ]; then
shellArgs+=("--arg config {android_sdk.accept_license=true;status_go.src_override=\"${STATUS_GO_SRC_OVERRIDE}\";}") shellArgs+=("--arg config {status_go.src_override=\"${STATUS_GO_SRC_OVERRIDE}\";}")
fi fi
# if _NIX_ATTR is specified we shouldn't use shell.nix, the path will be different # if _NIX_ATTR is specified we shouldn't use shell.nix, the path will be different

2
scripts/release-android.sh
View File

@ -7,7 +7,7 @@ source "$_current_dir/lib/setup/path-support.sh"
source_lib "platform.sh" source_lib "platform.sh"
nixOpts=( nixOpts=(
"--arg config {android_sdk.accept_license=true;status_go.src_override=\"${STATUS_GO_SRC_OVERRIDE}\";}" "--arg config {status_go.src_override=\"${STATUS_GO_SRC_OVERRIDE}\";}"
"--arg env {BUILD_ENV=\"${BUILD_ENV}\";ANDROID_ABI_SPLIT=\"${ANDROID_ABI_SPLIT}\";ANDROID_ABI_INCLUDE=\"${ANDROID_ABI_INCLUDE}\";}" "--arg env {BUILD_ENV=\"${BUILD_ENV}\";ANDROID_ABI_SPLIT=\"${ANDROID_ABI_SPLIT}\";ANDROID_ABI_INCLUDE=\"${ANDROID_ABI_INCLUDE}\";}"
"--argstr build-type ${BUILD_TYPE}" "--argstr build-type ${BUILD_TYPE}"
"--argstr build-number ${BUILD_NUMBER}" "--argstr build-number ${BUILD_NUMBER}"

2
shell.nix
View File

@ -1,4 +1,4 @@
{ config ? { android_sdk.accept_license = true; }, { config ? { },
nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { inherit config; }, nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { inherit config; },
pkgs ? nixpkgs-bootstrap.pkgs, pkgs ? nixpkgs-bootstrap.pkgs,
target-os ? "none" }: target-os ? "none" }: