From 244f0456f06066a87ba37e610f638b60489e14ef Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 27 Nov 2016 12:21:25 +0300 Subject: [PATCH 1/2] genymotion: add menu item --- pkgs/development/mobile/genymotion/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index f21c25a60f7..d5f1b09a946 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,5 @@ { stdenv, requireFile, makeWrapper, which, zlib, mesa_noglu, glib, xorg, libxkbcommon +, xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -17,17 +18,24 @@ stdenv.mkDerivation rec { sha256 = "0j1dzry6wf6cw3yr318z81rmj79r6w5l6vpilm7m9h786jrgywa1"; }; - buildInputs = [ makeWrapper which ]; + buildInputs = [ makeWrapper which xdg_utils ]; unpackPhase = '' + mkdir -p phony-home $out/share/applications + export HOME=$TMP/phony-home + mkdir ${name} echo "y" | sh $src -d ${name} sourceRoot=${name} + + substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \ + $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec" ''; installPhase = '' mkdir -p $out/bin $out/libexec mv genymotion $out/libexec/ + ln -s $out/libexec/genymotion/{genymotion,player} $out/bin ''; fixupPhase = '' @@ -38,7 +46,7 @@ stdenv.mkDerivation rec { patchExecutable() { patchInterpreter "$1" - makeWrapper "$out/libexec/genymotion/$1" "$out/bin/$1" \ + wrapProgram "$out/libexec/genymotion/$1" \ --set "LD_LIBRARY_PATH" "${libPath}" } From af1dacc2c33ce97fbd36a4856afcc3297c8645e1 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sun, 27 Nov 2016 13:18:24 +0300 Subject: [PATCH 2/2] genymotion: 2.7.2 -> 2.8.0 --- pkgs/development/mobile/genymotion/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index d5f1b09a946..745111171bb 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "genymotion-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = requireFile { - url = https://www.genymotion.com/account/login/; + url = https://www.genymotion.com/download/; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "0j1dzry6wf6cw3yr318z81rmj79r6w5l6vpilm7m9h786jrgywa1"; + sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; buildInputs = [ makeWrapper which xdg_utils ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.genymotion.com/; license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; + platforms = ["x86_64-linux"]; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; }; }