Browse Source

Ensure shell.nix uses same nixpkgs as the rest of the environment

also remove gradle wrapper

Signed-off-by: Jakub Sokołowski <jakub@status.im>
tags/pre-yarn2nix-push
Pedro Pombeiro 2 months ago
parent
commit
fad5f318cf
No account linked to committer's email address

+ 6
- 0
.watchmanconfig View File

@@ -0,0 +1,6 @@
{
"ignore_dirs": [
"android/build",
"target"
]
}

BIN
android/gradle/wrapper/gradle-wrapper.jar View File


+ 0
- 6
android/gradle/wrapper/gradle-wrapper.properties View File

@@ -1,6 +0,0 @@
#Sun Jan 22 10:12:39 EET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

+ 4
- 9
default.nix View File

@@ -1,16 +1,11 @@
# target-os = [ 'windows' 'linux' 'macos' 'darwin' 'android' 'ios' 'all' ]
{ config ? { android_sdk.accept_license = true; },
pkgs ? import ((import <nixpkgs> { }).fetchFromGitHub {
owner = "status-im";
repo = "nixpkgs";
rev = "db492b61572251c2866f6b5e6e94e9d70e7d3021";
sha256 = "188r7gbcrxi20nj6xh9bmdf3lbjwb94v9s0wpacl7q39g1fca66h";
name = "nixpkgs-source";
}) { inherit config; },
{ config ? null,
nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { inherit config; },
pkgs ? nixpkgs-bootstrap.pkgs,
stdenv ? pkgs.stdenv,
target-os ? "all" }:

(pkgs.callPackage ./derivation.nix { inherit pkgs target-os config; }).overrideAttrs(_: {
(pkgs.callPackage ./derivation.nix { inherit pkgs target-os; inherit (nixpkgs-bootstrap) config; }).overrideAttrs(_: {
src = null;
# TODO: Figure out if there's a better way to do this
# NOTE: There's a weird difference in behavior between Linux and macOS: in Linux the packages will only be fetched by `nix build` if unpackPhase exists. In macOS it's the other way around :-/

+ 13
- 0
nix/nixpkgs-bootstrap.nix View File

@@ -0,0 +1,13 @@
# This file controls the pinned version of nixpkgs we use for our Nix environment
{ config ? { android_sdk.accept_license = true; },
pkgs ? (import ((import <nixpkgs> { }).fetchFromGitHub {
owner = "status-im";
repo = "nixpkgs";
rev = "db492b61572251c2866f6b5e6e94e9d70e7d3021";
sha256 = "188r7gbcrxi20nj6xh9bmdf3lbjwb94v9s0wpacl7q39g1fca66h";
name = "nixpkgs-source";
})) { inherit config; } }:

{
inherit pkgs config;
}

+ 3
- 2
shell.nix View File

@@ -1,9 +1,10 @@
{ pkgs ? import <nixpkgs> {},
{ nixpkgs-bootstrap ? import ./nix/nixpkgs-bootstrap.nix { },
pkgs ? nixpkgs-bootstrap.pkgs,
target-os ? "all" }:
with pkgs;

let
projectDeps = import ./default.nix { inherit target-os; };
projectDeps = import ./default.nix { inherit target-os pkgs nixpkgs-bootstrap; inherit (nixpkgs-bootstrap) config; };
platform = callPackage ./nix/platform.nix { inherit target-os; };
useFastlanePkg = (platform.targetAndroid && !stdenv'.isDarwin);
# TODO: Try to use stdenv for iOS. The problem is with building iOS as the build is trying to pass parameters to Apple's ld that are meant for GNU's ld (e.g. -dynamiclib)

Loading…
Cancel
Save