nix: Move status-go package further down where it is actually used

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>

derivation.nix

@@ -8,8 +8,8 @@ with pkgs;
     platform = callPackage ./nix/platform.nix { inherit target-os; };
     # 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)
     _stdenv = stdenvNoCC;
-    statusDesktop = callPackage ./nix/desktop { inherit target-os; stdenv = _stdenv; };
+    statusDesktop = callPackage ./nix/desktop { inherit target-os status-go; stdenv = _stdenv; };
-    statusMobile = callPackage ./nix/mobile { inherit target-os config; stdenv = _stdenv; };
+    statusMobile = callPackage ./nix/mobile { inherit target-os config status-go; stdenv = _stdenv; };
     status-go = callPackage ./nix/status-go { inherit target-os; inherit (xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; };
     nodejs' = nodejs-10_x;
     yarn' = yarn.override { nodejs = nodejs'; };
@@ -22,7 +22,7 @@ with pkgs;
       nodejs'
       python27 # for e.g. gyp
       yarn'
-    ] ++ (map (x: nodeInputs."${x}") (builtins.attrNames nodeInputs));
+    ] ++ (builtins.attrValues nodeInputs);
 
   in _stdenv.mkDerivation rec {
     name = "status-react-build-env";
@@ -32,15 +32,13 @@ with pkgs;
       leiningen
       maven
       watchman
-    ] ++ status-go.packages
+    ] ++ nodePkgBuildInputs
-      ++ nodePkgBuildInputs
       ++ lib.optional isDarwin cocoapods
       ++ lib.optional (isDarwin && !platform.targetIOS) clang
       ++ lib.optional (!isDarwin) gcc7
       ++ lib.optionals platform.targetDesktop statusDesktop.buildInputs
       ++ lib.optionals platform.targetMobile statusMobile.buildInputs;
     shellHook =
-      status-go.shellHook +
       lib.optionalString platform.targetDesktop statusDesktop.shellHook +
       lib.optionalString platform.targetMobile statusMobile.shellHook;
   }

nix/desktop/default.nix

@@ -1,12 +1,12 @@
-{ stdenv, pkgs, target-os }:
+{ stdenv, pkgs, target-os, status-go }:
 
 with pkgs;
 with stdenv;
 
 let
   platform = callPackage ../platform.nix { inherit target-os; };
-  linuxPlatform = callPackage ./linux { };
+  linuxPlatform = callPackage ./linux { inherit status-go; };
-  darwinPlatform = callPackage ./macos { };
+  darwinPlatform = callPackage ./macos { inherit status-go; };
   windowsPlatform = callPackage ./windows { };
   snoreNotifySources = callPackage ./cmake/snorenotify { };
   qtkeychainSources = callPackage ./cmake/qtkeychain { };

nix/desktop/linux/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, pkgs }:
+{ stdenv, pkgs, status-go }:
 
 with pkgs;
 with stdenv;
@@ -11,7 +11,14 @@ let
   linuxdeployqt = callPackage ./linuxdeployqt { inherit appimagekit; };
 
 in {
-  buildInputs = [ appimagekit linuxdeployqt patchelf baseImage ];
+  buildInputs = [
+    appimagekit
+    linuxdeployqt
+    patchelf
+    baseImage
+  ] ++ status-go.packages;
 
-  inherit (baseImage) shellHook;
+  shellHook =
+    baseImage.shellHook +
+    status-go.shellHook;
 }

nix/desktop/macos/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, pkgs }:
+{ stdenv, pkgs, status-go }:
 
 with pkgs;
 with stdenv;
@@ -11,11 +11,14 @@ let
 
 in
 {
-  buildInputs = [ baseImage ] ++
+  buildInputs = [
-    [ AppKit Cocoa darwin.cf-private Foundation OpenGL ];
+    baseImage status-go.packages
+    AppKit Cocoa darwin.cf-private Foundation OpenGL
+  ];
 
-  shellHook = ''
+  shellHook =
-    ${baseImage.shellHook}
+    baseImage.shellHook +
+    status-go.shellHook + ''
       export NIX_TARGET_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_TARGET_LDFLAGS"
     '';
 }

nix/mobile/default.nix

@@ -1,4 +1,4 @@
-{ config, stdenv, pkgs, target-os ? "all" }:
+{ config, stdenv, pkgs, target-os ? "all", status-go }:
 
 with pkgs;
 with stdenv;
@@ -18,8 +18,10 @@ in
     inherit xcodewrapperArgs;
 
     buildInputs =
-      lib.optional platform.targetAndroid android.buildInputs ++
+      status-go.packages ++
+      lib.optionals platform.targetAndroid android.buildInputs ++
       lib.optional (platform.targetIOS && isDarwin) xcodeWrapper;
     shellHook =
+      status-go.shellHook +
       lib.optionalString platform.targetAndroid android.shellHook;
   }