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

Ensure a consistent golang version is used throughout Nix

This commit is contained in:
Pedro Pombeiro 2019-06-07 16:37:30 +02:00
parent ea8bf402d7
commit 9b7b5b9608
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
derivation.nix
View File

@ -10,7 +10,7 @@ let
gradle = pkgs.gradle_4_10;
go = pkgs.go_1_11;
buildGoPackage = pkgs.buildGoPackage.override { inherit go; };
statusDesktop = pkgs.callPackage ./nix/desktop { inherit target-os status-go pkgs; inherit (pkgs) darwin; stdenv = stdenv'; nodejs = nodejs'; };
statusDesktop = pkgs.callPackage ./nix/desktop { inherit target-os status-go pkgs go; inherit (pkgs) darwin; stdenv = stdenv'; nodejs = nodejs'; };
statusMobile = pkgs.callPackage ./nix/mobile { inherit target-os config pkgs status-go gradle; inherit (pkgs.xcodeenv) composeXcodeWrapper; stdenv = stdenv'; nodejs = nodejs'; };
status-go = pkgs.callPackage ./nix/status-go { inherit target-os go buildGoPackage; inherit (pkgs.xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; };
nodejs' = pkgs.nodejs-10_x;

27
nix/desktop/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, pkgs, callPackage, target-os,
cmake, extra-cmake-modules, file, status-go,
cmake, extra-cmake-modules, file, status-go, go,
darwin, nodejs }:
with stdenv;
@ -8,7 +8,7 @@ let
platform = callPackage ../platform.nix { inherit target-os; };
linuxPlatform = callPackage ./linux { inherit status-go; };
darwinPlatform = callPackage ./macos { inherit status-go darwin; };
windowsPlatform = callPackage ./windows { };
windowsPlatform = callPackage ./windows { inherit go; };
snoreNotifySources = callPackage ./cmake/snorenotify { };
qtkeychainSources = callPackage ./cmake/qtkeychain { };
selectedSources =
@ -20,16 +20,15 @@ let
inherit pkgs nodejs;
};
in
{
buildInputs = [
cmake
extra-cmake-modules
file
snoreNotifySources
qtkeychainSources
] ++ lib.catAttrs "buildInputs" selectedSources
++ (builtins.attrValues nodeInputs);
in {
buildInputs = [
cmake
extra-cmake-modules
file
snoreNotifySources
qtkeychainSources
] ++ lib.catAttrs "buildInputs" selectedSources
++ (builtins.attrValues nodeInputs);
shellHook = lib.concatStrings (lib.catAttrs "shellHook" (selectedSources ++ [ snoreNotifySources qtkeychainSources ]));
}
shellHook = lib.concatStrings (lib.catAttrs "shellHook" (selectedSources ++ [ snoreNotifySources qtkeychainSources ]));
}

2
nix/status-go/default.nix
View File

@ -7,7 +7,7 @@ with stdenv;
let
platform = callPackage ../platform.nix { inherit target-os; };
utils = callPackage ../utils.nix { inherit xcodeWrapper; };
gomobile = callPackage ./gomobile { inherit (androidPkgs) platform-tools; inherit buildGoPackage composeXcodeWrapper xcodewrapperArgs utils; };
gomobile = callPackage ./gomobile { inherit (androidPkgs) platform-tools; inherit composeXcodeWrapper xcodewrapperArgs utils buildGoPackage; };
buildStatusGoDesktopLib = callPackage ./build-desktop-status-go.nix { inherit buildGoPackage go xcodeWrapper utils; };
buildStatusGoMobileLib = callPackage ./build-mobile-status-go.nix { inherit buildGoPackage go gomobile xcodeWrapper utils; };
extractStatusGoConfig = f: lib.last (lib.splitString "\n" (lib.fileContents f));