diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/development/mobile/titaniumenv | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile/titaniumenv')
-rw-r--r-- | nixpkgs/pkgs/development/mobile/titaniumenv/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix (renamed from nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix) | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix index 6821474c4d01..c85eab108ffc 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix @@ -1,8 +1,8 @@ -{pkgs, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: +{pkgs, androidenv, xcodeenv, tiVersion ? "8.2.1.GA"}: rec { titaniumsdk = let - titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix + titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix else throw "Titanium version not supported: "+tiVersion; in diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 13abc18f76ec..45523fad9082 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -53,14 +53,14 @@ let }; in stdenv.mkDerivation { - name = "mobilesdk-7.1.0.GA"; + name = "mobilesdk-8.2.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip; - sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn"; + url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip; + sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip; - sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m"; + url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip; + sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l"; } else throw "Platform: ${stdenv.system} not supported!"; @@ -73,7 +73,7 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - mv * 7.1.0.GA + mv * 8.2.1.GA cd * # Patch bundled gradle build infrastructure to make shebangs work @@ -87,6 +87,13 @@ stdenv.mkDerivation { # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # Patch the strip frameworks script in the iPhone build template to not let + # it skip the strip phase. This is caused by an assumption on the file + # permissions in which Nix deviates from the standard. + sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh + ''} + # Patch some executables ${if stdenv.system == "i686-linux" then |