fixup! Create Nix package for building status-go

status-im · Apr 6, 2019 · ea22e0a · ea22e0a
1 parent 89a3f4a
commit ea22e0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nix/status-go/default.nix b/nix/status-go/default.nix
@@ -3,7 +3,7 @@
 with stdenv;
 
 let
-   gomobile = pkgs.callPackage ./gomobile { inherit androidPkgs xcodeWrapper; };
+   gomobile = pkgs.callPackage ./gomobile { inherit (androidPkgs) platform-tools xcodeWrapper; };
    version = lib.fileContents ../../STATUS_GO_VERSION; # TODO: Simplify this path search with lib.locateDominatingFile
    owner = lib.fileContents ../../STATUS_GO_OWNER;
    repo = "status-go";

diff --git a/nix/status-go/gomobile/default.nix b/nix/status-go/gomobile/default.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgs, buildGoPackage, fetchgit,
-  glibc, ncurses5, zlib, androidPkgs,
+  glibc, ncurses5, zlib, platform-tools,
   makeWrapper, patchelf, xcodeWrapper
 }:
 
@@ -26,7 +26,7 @@ buildGoPackage rec {
     ++ lib.optional isDarwin [ ./ignore-nullability-error-on-ios.patch ];
 
   postPatch = ''
-    substituteInPlace cmd/gomobile/install.go --replace "\`adb\`" "\`${androidPkgs.androidsdk}/bin/adb\`"
+    substituteInPlace cmd/gomobile/install.go --replace "\`adb\`" "\`${platform-tools}/bin/adb\`"
 
     echo "Creating $dev"
     mkdir -p $dev/src/$goPackagePath