diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:34:50 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:34:50 +0200 |
| commit | 8e9d8d8b70f2a5515ffa4b2dad18cf5783ab1e4e (patch) | |
| tree | c2f70049be19f757f1ae6b2b80c3bfe70a47612c /nixpkgs/pkgs/development/mobile/androidenv | |
| parent | 240cb27216dbb4203e2d470d78888b5cf82809ac (diff) | |
| parent | 467ce5a9f45aaf96110b41eb863a56866e1c2c3c (diff) | |
Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile/androidenv')
| -rw-r--r-- | nixpkgs/pkgs/development/mobile/androidenv/emulator.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix index 2402d5433ed..5840598d1c3 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix @@ -36,9 +36,12 @@ deployAndroidPackage { addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib autoPatchelf $out - # Wrap emulator so that it can load libdbus-1.so at runtime and it no longer complains about XKB keymaps + # Wrap emulator so that it can load required libraries at runtime wrapProgram $out/libexec/android-sdk/emulator/emulator \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.dbus ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ + pkgs.dbus + pkgs.systemd + ]} \ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale ''; |