John Ericson
14b427a7e4
Merge pull request #119092 from numinit/update-androidenv
...
androidenv: Allow multiple ndkVersions to be specified
2021-04-25 10:08:05 -04:00
Morgan Jones
a7e5b070be
androidenv: Allow multiple ndkVersions to be specified
...
Android is deprecating ndk.dir in favor of specifying exact NDK
version in Gradle configuration. Ensure that we can support multiple
NDKs, and link them into the location the Android Gradle Plugin expects.
2021-04-24 15:56:08 -06:00
Jakub Sokołowski
dd2a8245a1
gomobile: init at 2020-06-22
...
The Android SDK is provided by `nixpkgs`, and in case of the Status Project
we build our app using that SDK in combination with gomobile since our
protocol library is written in Go:
https://github.com/golang/mobile
This tool is quite powerful and allows you even to build entire applications in Go:
https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile#hdr-Compile_android_APK_and_iOS_app
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2021-04-23 11:17:17 +02:00
Sandro
151d746ab5
Merge pull request #115229 from rolfschr/android-fix-shebang-in-make-standalone-toolchain
2021-03-30 16:59:38 +02:00
Rolf Schröder
c03f846b46
android: replace '$(pwd)' by '.'
2021-03-27 12:46:58 +01:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next
2021-03-18 13:35:59 +01:00
Samuel Gräfenstein
6b6d2abfa0
treewide: xlibs -> xorg
...
Fix building with `config.allowAliases = false;`.
2021-03-17 00:00:18 +01:00
github-actions[bot]
121cc02fe8
Merge master into staging-next
2021-03-12 06:17:54 +00:00
Steven Pease
b2942f0e2a
cocoapods-beta: 1.10.0 -> 1.10.1
2021-03-11 13:10:59 -08:00
Steven Pease
108aa14927
cocoapods: 1.10.0 -> 1.10.1
2021-03-11 13:10:04 -08:00
Rolf Schröder
2985284ccb
android: Fix shebangs in auto-generated android toolchain scripts
...
The script make_standalone_toolchain.py autogenerates some shell scripts
when invoked. These scripts have a hardcoded shebang of '#!/bin/bash'.
The generated scripts obviously do not work in a Nix environment. This
commit makes sure the scripts have the correct shebang.
2021-03-09 21:13:28 +01:00
Jan Tojnar
6d1958ad2d
Merge branch 'staging-next' into staging
2021-03-04 22:16:45 +01:00
s1341
aee60bef7a
android_prebuilt: Fix eval
2021-03-04 18:17:39 +00:00
Ben Siraphob
127733211e
treewide: unzip buildInputs to nativeBuildInputs ( #112302 )
2021-02-20 16:01:53 -05:00
Ben Siraphob
e03c068af5
treewide: makeWrapper buildInputs to nativeBuildInputs
2021-02-19 20:09:16 +07:00
Ben Siraphob
a6ac3eedbd
treewide: xdg_utils -> xdg-utils
2021-02-01 15:05:09 +07:00
Ryan Burns
b98bfb6536
androidenv: do not copy verbosely
...
Verbose copying can exceed hydra's output limit,
causing spurious failures. For example, see:
https://hydra.nixos.org/eval/1644892?filter=android
2021-01-27 02:03:14 -08:00
Pavol Rusnak
a6f6f739c8
Merge pull request #109655 from prusnak/stdenv-lib-mobile
...
pkgs/development/mobile: stdenv.lib -> lib
2021-01-23 12:11:03 +01:00
zowoq
59b83c43e0
treewide: add final newline
2021-01-22 07:18:04 +10:00
Pavol Rusnak
c3bbfb77ad
pkgs/development/mobile: stdenv.lib -> lib
2021-01-21 20:45:23 +01:00
zowoq
932941b79c
treewide: editorconfig fixes
...
- remove trailing whitespace
- use spaces for indentation
2021-01-21 13:29:54 +10:00
Jonathan Ringer
9bb3fccb5b
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
...
continuation of #109595
pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.
python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Profpatsch
4a7f99d55d
treewide: with stdenv.lib; in meta -> with lib;
...
Part of: https://github.com/NixOS/nixpkgs/issues/108938
meta = with stdenv.lib;
is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.
This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.
The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
numinit
5b91d4ab65
Rework androidenv package generation
...
androidenv did not previously write license files, which caused certain
gradle-based Android tools to fail. Restructure androidenv's list of
Android packages into a single repo.json file to prevent duplication
and enable us to extract the EULA texts, which we then hash with
builtins.hashString to produce the license files that Android gradle
tools look for.
Remove includeDocs and lldbVersions, as these have been removed
from the Android package repositories.
Improve documentation and examples.
2021-01-03 21:27:23 -07:00
Jan Tojnar
3afc4e8a81
androidsdk_9_0: fix evaluation without aliases
2020-12-06 11:07:40 +01:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux
2020-11-24 12:42:06 -05:00
Lily Ballard
a5ec423734
cocoapods-beta: 1.10.0.beta.2 -> 1.10.0
2020-11-07 20:30:27 -05:00
Lily Ballard
16ee3d1e09
cocoapods: 1.9.3 -> 1.10.0
2020-11-07 20:30:27 -05:00
Ben Siraphob
db74029e3e
treewide: remove package names from prefix of descriptions
2020-10-27 09:15:07 -07:00
Ben Siraphob
683a87dbeb
treewide: remove periods from end of package descriptions
2020-10-17 08:22:31 -07:00
John Ericson
452854a13c
androidndk: Avoid depending on target-sensative openjdk
...
We just need jdk for this script that helps set up toolchains. The
script might need to know about the target platform, but the interpreter
that runs it (or part of it) doesn't.
2020-09-08 09:49:39 -04:00
John Ericson
4c489b5f5d
deployAndroidPackage: Use pname
and version
2020-09-08 09:31:18 -04:00
Matthew Bauer
d0e52b6b32
Merge pull request #95309 from obsidiansystems/mobile-fixes
...
Support Android 29 in cross-compilation
2020-08-28 14:59:37 -05:00
eyjhb
f13d952121
androidenv: fix convert files not quoting urls
2020-08-19 16:40:28 +02:00
Matthew Bauer
4cbca0893a
androidenv: remove duplicate addons.nix entries
2020-08-17 23:51:59 -05:00
Matthew Bauer
074bc78cc8
android: update sdk, ndk to 29, 21
2020-08-17 23:51:53 -05:00
Luca Favatella
7802608649
androidenv/emulate-app: use runtimeShell instead of stdenv.shell
...
See also https://github.com/NixOS/nixpkgs PR 56408.
2020-08-16 10:27:37 +00:00
Lily Ballard
b02225db76
cocoapods-beta: 1.10.0.beta.1 -> 1.10.0.beta.2
2020-08-12 13:27:20 -07:00
eyjhb
2d999d7e6e
androidenv.build-tools: add libc++ to enable buildToolsVersion 29.0.3
2020-08-01 16:53:51 +02:00
Lily Ballard
c4ce0b778c
cocoapods-beta: 1.9.3 -> 1.10.0.beta.1
2020-07-26 23:19:30 -07:00
Maximilian Bosch
4f67c0cc6c
adb-sync: 2016-08-31 -> 2019-01-01
...
Simple tool to synchronize a directory-tree between a local machine and
an Android device using `adb` and `rsync`.
Since this repo doesn't have any releases atm, I added the `-unstable`
suffix to `pname`. Since 2016-08-31 the following things changed:
7fc48ad1e1...fb7c549753
Also applied the following changes to the derivation:
* Removed the `phases` hack to enable important things like `fixupPhase`
again (amongst other things this is needed for shebang-patching and
reference-checks).
* Fixed the wrapper to make sure that every binary needed by those
scripts is available.
* Added myself as additional maintainer.
2020-06-10 01:40:29 +02:00
Lily Ballard
9a11cd674e
cocoapods-beta: 1.9.2 -> 1.9.3
2020-05-30 14:17:09 -07:00
Lily Ballard
8cc640b5cb
cocoapods: 1.9.2 -> 1.9.3
2020-05-30 14:17:01 -07:00
vponte
7d69a04d79
androidenv: add missing emulator dynamic libraries
2020-05-30 15:43:32 +02:00
Jörg Thalheim
6602f87384
nodePackages: switch to 12
...
Signed-off-by: Christian Albrecht <christian.albrecht@mayflower.de>
2020-05-27 21:45:41 +02:00
Lily Ballard
30c5973f46
cocoapods-beta: 1.9.1 -> 1.9.2
2020-05-22 17:15:27 -07:00
Lily Ballard
c364ed710f
cocoapods: 1.9.1 -> 1.9.2
2020-05-22 17:15:16 -07:00
Jan Tojnar
e89e2edc73
libusb-compat-0_1: rename from libusb
2020-04-28 05:33:41 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Samuel Leathers
72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4
...
bundler: 1.17.3 -> 2.1.4
2020-04-08 12:44:54 -04:00