Unverified Commit 5a0be37d authored by Morgan Jones's avatar Morgan Jones Committed by GitHub
Browse files

androidenv: emulator: fix non-Linux path/binary symlink (#412681)

parents 47aa5fd2 4a2735df

pkgs/development/mobile/androidenv/emulator.nix

+35 −33
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ deployAndroidPackage { 
      libxshmfence

    ])

    ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc;

  patchInstructions = lib.optionalString (os == "linux") ''

  patchInstructions =

    (lib.optionalString (os == "linux") ''

      addAutoPatchelfSearchPath $packageBaseDir/lib

      addAutoPatchelfSearchPath $packageBaseDir/lib64

      addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
@@ -85,7 +86,8 @@ deployAndroidPackage { 
        } \

        --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \

        --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale



    '')

    + ''

      mkdir -p $out/bin

      cd $out/bin

      find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do