diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
| commit | 072c01a28f865e9487df09aed7ddff328252fb36 (patch) | |
| tree | 6df6e652915940255f294ed8998cce1c4c7c2d40 /nixpkgs/pkgs/development/mobile | |
| parent | 024b46ff20027c15322e5d868ecec42632556d4b (diff) | |
| parent | 969cff2691a02b3d7e5468beda26c482d8986644 (diff) | |
| download | nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.gz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.bz2 nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.lz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.xz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.zst nixlib-072c01a28f865e9487df09aed7ddff328252fb36.zip | |
Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile')
| -rw-r--r-- | nixpkgs/pkgs/development/mobile/androidenv/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/default.nix index 925601054225..8d57f737c340 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/default.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/default.nix @@ -1,6 +1,6 @@ -{ pkgs ? import <nixpkgs> {} +{ config, pkgs ? import <nixpkgs> {} , pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; } -, licenseAccepted ? false +, licenseAccepted ? config.android_sdk.accept_license or false }: rec { diff --git a/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix b/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix index b88f806d5866..05ddf5366c72 100644 --- a/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ <string>${codeSignIdentity}</string> <key>provisioningProfiles</key> <dict> - <key>${stdenv.lib.toLower bundleId}</key> + <key>${bundleId}</key> <string>$PROVISIONING_PROFILE</string> </dict> <key>signingStyle</key> @@ -129,9 +129,9 @@ stdenv.mkDerivation ({ ${stdenv.lib.optionalString enableWirelessDistribution '' # Add another hacky build product that enables wireless adhoc installations - appname="$(basename "$out/*.ipa" .ipa)" - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html - echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + appname="$(basename "$(echo $out/*.ipa)" .ipa)" + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/''${appname}.html + echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products ''} ''} ${stdenv.lib.optionalString generateXCArchive '' |