Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ea9f3fca6587
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7fa2f865b896
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 21, 2018

  1. titaniumenv: fix Android signing on darwin 

    (cherry picked from commit 4beb695)
    @svanderburg
    svanderburg committed Mar 21, 2018
    Copy the full SHA
    7fa2f86 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/development/mobile/titaniumenv/build-app.nix
8 changes: 7 additions & 1 deletion pkgs/development/mobile/titaniumenv/build-app.nix
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,13 @@ stdenv.mkDerivation {
export GRADLE_USER_HOME=$TMPDIR/gradle
${if release then
''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out''
''
${stdenv.lib.optionalString stdenv.isDarwin ''
# Signing the app does not work with OpenJDK on macOS, use host SDK instead
export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
''}
titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out
''
else
''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''}
''