public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

titaniumenv: remove 7.1, add 8.2 and make it the default

Browse Source
This commit is contained in:
Sander van der Burg 2019-11-11 08:50:05 +01:00
parent 1a2415e9a9
commit 173bf3473c
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/mobile/titaniumenv/default.nix
View File

@ -1,8 +1,8 @@
{pkgs, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: {pkgs, androidenv, xcodeenv, tiVersion ? "8.2.1.GA"}:
rec { rec {
titaniumsdk = let 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 if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix
else throw "Titanium version not supported: "+tiVersion; else throw "Titanium version not supported: "+tiVersion;
in in

19
pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix → pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
View File

@ -53,14 +53,14 @@ let
}; };
in in
stdenv.mkDerivation { 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 { 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; url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip;
sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn"; sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl";
} }
else if stdenv.system == "x86_64-darwin" then fetchurl { 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; url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip;
sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m"; sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l";
} }
else throw "Platform: ${stdenv.system} not supported!"; else throw "Platform: ${stdenv.system} not supported!";
@ -73,7 +73,7 @@ stdenv.mkDerivation {
# Rename ugly version number # Rename ugly version number
cd mobilesdk/* cd mobilesdk/*
mv * 7.1.0.GA mv * 8.2.1.GA
cd * cd *
# Patch bundled gradle build infrastructure to make shebangs work # 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 # 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 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 # Patch some executables
${if stdenv.system == "i686-linux" then ${if stdenv.system == "i686-linux" then