mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

Allow appnames with spaces everywhere

Browse source
This commit is contained in:
Sander van der Burg 2013-03-21 14:11:58 +01:00
parent 1dbd3a55c4
commit 647bca444c
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/mobile/androidenv/build-app.nix
View file

@ -13,7 +13,8 @@ let
androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; };
in
stdenv.mkDerivation {
inherit name src;
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
@ -36,9 +37,9 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out
mv bin/*-${if release then "release" else "debug"}.apk $out
mv "bin/*-${if release then "release" else "debug"}.apk" $out
mkdir -p $out/nix-support
echo "file binary-dist $(echo $out/*.apk)" > $out/nix-support/hydra-build-products
echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products
'';
}

8
pkgs/development/mobile/titaniumenv/build-app.nix
View file

@ -110,13 +110,17 @@ stdenv.mkDerivation {
if target == "android" then
''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out''
else if target == "iphone" && release then
"cp -av build/iphone/build/* $out"
''
cp -av build/iphone/build/* $out
mkdir -p $out/nix-support
echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
''
else if target == "iphone" then ""
else throw "Target: ${target} is not supported!"}
${if target == "android" then ''
mkdir -p $out/nix-support
echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
'' else ""}
'';

7
pkgs/development/mobile/xcodeenv/build-app.nix
View file

@ -44,7 +44,8 @@ let
deleteKeychain = "security delete-keychain $keychainName";
in
stdenv.mkDerivation {
inherit name src;
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
buildInputs = [ xcodewrapper ];
buildPhase = ''
${stdenv.lib.optionalString release ''
@ -79,11 +80,11 @@ stdenv.mkDerivation {
${stdenv.lib.optionalString release ''
${stdenv.lib.optionalString generateIPA ''
# Produce an IPA file
xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
xcrun -sdk iphoneos PackageApplication -v $out/*.app -o "$out/${name}.ipa"
# Add IPA to Hydra build products
mkdir -p $out/nix-support
echo "file binary-dist $(echo $out/*.ipa)" > $out/nix-support/hydra-build-products
echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
''}
# Delete our temp keychain