diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2018-03-20 17:39:45 +0100 |
---|---|---|
committer | Sander van der Burg <svanderburg@gmail.com> | 2018-03-20 17:39:45 +0100 |
commit | 5532cc1641c0d2f2dae2893e5980861bb4fd8062 (patch) | |
tree | f1c74d15788165d42be1a7bc70fb18a519ef1e1e /pkgs/development/mobile/titaniumenv | |
parent | e8e7e78d9fbc5eb8cfb49d51d796123a79a08799 (diff) | |
download | nixlib-5532cc1641c0d2f2dae2893e5980861bb4fd8062.tar nixlib-5532cc1641c0d2f2dae2893e5980861bb4fd8062.tar.gz nixlib-5532cc1641c0d2f2dae2893e5980861bb4fd8062.tar.bz2 nixlib-5532cc1641c0d2f2dae2893e5980861bb4fd8062.tar.lz nixlib-5532cc1641c0d2f2dae2893e5980861bb4fd8062.tar.xz nixlib-5532cc1641c0d2f2dae2893e5980861bb4fd8062.tar.zst nixlib-5532cc1641c0d2f2dae2893e5980861bb4fd8062.zip |
titaniumenv: remove obsolete java fix wrapper on darwin
Diffstat (limited to 'pkgs/development/mobile/titaniumenv')
-rw-r--r-- | pkgs/development/mobile/titaniumenv/build-app.nix | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 25713a1b88b2..a6bf05c2465b 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -15,34 +15,12 @@ let abiVersions = androidAbiVersions; useGoogleAPIs = true; }; - + deleteKeychain = '' security default-keychain -s login.keychain security delete-keychain $keychainName rm -f $HOME/lock-keychain ''; - - # On macOS, the java executable shows an -unoffical postfix in the version - # number. This confuses the build script's version detector. - # We fix this by creating a wrapper that strips it out of the output. - - javaVersionFixWrapper = stdenv.mkDerivation { - name = "javaVersionFixWrapper"; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/javac <<EOF - #! ${stdenv.shell} -e - - if [ "\$1" = "-version" ] - then - ${jdk}/bin/javac "\$@" 2>&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2 - else - exec ${jdk}/bin/javac "\$@" - fi - EOF - chmod +x $out/bin/javac - ''; - }; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; @@ -74,13 +52,6 @@ stdenv.mkDerivation { ${if target == "android" then '' - ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' - # Hack to make version detection work with OpenJDK on macOS - export PATH=${javaVersionFixWrapper}/bin:$PATH - export JAVA_HOME=${javaVersionFixWrapper} - javac -version - ''} - titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH |