diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 17:20:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 17:20:20 +0200 |
| commit | 8374a2a0eee41361d4af9d32460e4956dcbea61c (patch) | |
| tree | 0a4788ab72ad7968aad65dd0668147d065ea9951 /pkgs/applications/editors | |
| parent | 23be4a8b4de7790f48998d245a3ff5fe549e0f2b (diff) | |
| parent | 95f82e2a45266cdca661389705da7c672c7a9cbc (diff) | |
| download | nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.gz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.bz2 nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.lz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.xz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.zst nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 0625431462cb..1a6904b21768 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -39,6 +39,7 @@ , nss , pciutils , pkgsi686Linux +, ps , setxkbmap , stdenv , systemd @@ -89,6 +90,7 @@ let # Runtime stuff git + ps ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ |