4 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index 5d70a9f0a1c..b81fab1ed76 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -44,7 +44,7 @@ deployAndroidPackage {
     mkdir -p $out/bin
     for i in ndk-build
     do
-        ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
+        ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
     done
   '';
   noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix
index 9a816261b3e..0b9bb7c5b5f 100644
--- a/pkgs/development/mobile/cocoapods/default.nix
+++ b/pkgs/development/mobile/cocoapods/default.nix
@@ -9,6 +9,9 @@ bundlerApp rec {
   gemset = if beta then ./gemset-beta.nix else ./gemset.nix;
   exes = [ "pod" ];
 
+  # toString prevents the update script from being copied into the nix store
+  passthru.updateScript = toString ./update;
+
   meta = with lib; {
     description     = "CocoaPods manages dependencies for your Xcode projects.";
     homepage        = https://github.com/CocoaPods/CocoaPods;
diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update
index 53c113046c6..309142e0e1d 100755
--- a/pkgs/development/mobile/cocoapods/update
+++ b/pkgs/development/mobile/cocoapods/update
@@ -3,6 +3,8 @@
 
 set -e
 
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
 rm -f Gemfile.lock Gemfile-beta.lock
 bundler lock
 BUNDLE_GEMFILE=Gemfile-beta bundler lock --lockfile=Gemfile-beta.lock
diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix
index 37834eff947..ba498ce0953 100644
--- a/pkgs/development/mobile/genymotion/default.nix
+++ b/pkgs/development/mobile/genymotion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
+{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
 , xdg_utils
 # For glewinfo
 , libXmu, libXi, libXext }:
@@ -10,10 +10,10 @@ let
   libPath = "${stdenv.lib.makeLibraryPath packages}";
 in
 stdenv.mkDerivation rec {
-  name = "genymotion-${version}";
+  pname = "genymotion";
   version = "2.8.0";
-  src = requireFile {
-    url = https://www.genymotion.com/download/;
+  src = fetchurl {
+    url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin";
     name = "genymotion-${version}-linux_x64.bin";
     sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk";
   };
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
     mkdir -p phony-home $out/share/applications
     export HOME=$TMP/phony-home
 
-    mkdir ${name}
-    echo "y" | sh $src -d ${name}
-    sourceRoot=${name}
+    mkdir ${pname}
+    echo "y" | sh $src -d ${pname}
+    sourceRoot=${pname}
 
     substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \
-      $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec"
+      $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${pname}" "$out/libexec"
   '';
 
   installPhase = ''