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

pkgs/development/mobile: stdenv.lib -> lib

Browse Source
This commit is contained in:
Pavol Rusnak
2021-01-21 20:45:23 +01:00
parent 7ed3d2df76
commit c3bbfb77ad
11 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/mobile/titaniumenv/build-app.nix
+7 -7
View File
@@ -1,4 +1,4 @@
{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
{ name, src, preBuild ? "", target, tiVersion ? null
, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false
@@ -34,14 +34,14 @@ let
extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
in
stdenv.mkDerivation ({
name = stdenv.lib.replaceChars [" "] [""] name;
name = lib.replaceChars [" "] [""] name;
buildInputs = [ nodejs titanium alloy python which file jdk ];
buildPhase = ''
${preBuild}
${stdenv.lib.optionalString stdenv.isDarwin ''
${lib.optionalString stdenv.isDarwin ''
# Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error.
alloy=$(dirname $(type -p alloy))/..
cp -rv $alloy/* alloy
@@ -51,7 +51,7 @@ stdenv.mkDerivation ({
export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
${stdenv.lib.optionalString (tiVersion != null) ''
${lib.optionalString (tiVersion != null) ''
# Replace titanium version by the provided one
sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
''}
@@ -76,7 +76,7 @@ stdenv.mkDerivation ({
export GRADLE_USER_HOME=$TMPDIR/gradle
${if release then ''
${stdenv.lib.optionalString stdenv.isDarwin ''
${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)"
''}
@@ -171,7 +171,7 @@ stdenv.mkDerivation ({
mkdir -p $out/nix-support
echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
${stdenv.lib.optionalString enableWirelessDistribution ''
${lib.optionalString enableWirelessDistribution ''
appname="$(basename $out/*.ipa .ipa)"
bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
@@ -184,5 +184,5 @@ stdenv.mkDerivation ({
else throw "Target: ${target} is not supported!"}
'';
failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
failureHook = lib.optionalString (release && target == "iphone") deleteKeychain;
} // extraArgs)
pkgs/development/mobile/titaniumenv/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@ rec {
else throw "Titanium version not supported: "+tiVersion;
in
import titaniumSdkFile {
inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) stdenv lib fetchurl unzip makeWrapper;
};
buildApp = import ./build-app.nix {
inherit (pkgs) stdenv python which file jdk nodejs;
inherit (pkgs) stdenv lib python which file jdk nodejs;
inherit (pkgs.nodePackages) alloy titanium;
inherit (androidenv) composeAndroidPackages;
inherit (xcodeenv) composeXcodeWrapper;
pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, unzip, makeWrapper}:
{stdenv, lib, fetchurl, unzip, makeWrapper}:
let
# Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ 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") ''
${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.
pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, unzip, makeWrapper}:
{stdenv, lib, fetchurl, unzip, makeWrapper}:
let
# Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ 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") ''
${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.