diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-16 17:16:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-16 22:36:36 +0000 |
commit | cb6d0ec12187e0c2c11b203f3d8fa62790628141 (patch) | |
tree | 0ca0fedc67d5676e89438cffa3e0865eee0962e4 /nixpkgs/pkgs/development/mobile/titaniumenv | |
parent | 4d83b8e578d3a0b78d2694921c944172b009036a (diff) | |
parent | da1a2b1eeafa66b4419b4f275396d8a731eccb61 (diff) | |
download | nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.gz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.bz2 nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.lz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.xz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.zst nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.zip |
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Diffstat (limited to 'nixpkgs/pkgs/development/mobile/titaniumenv')
-rw-r--r-- | nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix index b3c8d380819c..9e19afb24429 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/build-app.nix @@ -40,8 +40,7 @@ in stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; - buildInputs = [ nodejs titanium alloy python which file jdk ] - ++ stdenv.lib.optional (target == "iphone") xcodewrapper; + buildInputs = [ nodejs titanium alloy python which file jdk ]; buildPhase = '' ${preBuild} @@ -91,6 +90,10 @@ stdenv.mkDerivation ({ ''} '' else if target == "iphone" then '' + # Be sure that the Xcode wrapper has priority over everything else. + # When using buildInputs this does not seem to be the case. + export PATH=${xcodewrapper}/bin:$PATH + # Configure the path to Xcode titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir} diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index cff1d73d3024..5c1cd0a265ab 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -87,6 +87,11 @@ 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 + # 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 |