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

Merge remote-tracking branch 'origin/master' into staging.

Browse Source 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
This commit is contained in:
Peter Simons
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/mobile/xcodeenv/build-app.nix
View File

@@ -15,9 +15,15 @@
, provisioningProfile ? null
, generateIPA ? false
, generateXCArchive ? false
, enableWirelessDistribution ? false
, installURL ? null
, bundleId ? null
, version ? null
, title ? null
}:
assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null;
assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null;
let
# Set some default values here
@@ -84,6 +90,12 @@ stdenv.mkDerivation {
# Add IPA to Hydra build products
mkdir -p $out/nix-support
echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
${stdenv.lib.optionalString enableWirelessDistribution ''
appname=$(basename $out/*.ipa .ipa)
sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${version}\&title=$appname|" ${./install.html.template} > $out/$appname.html
echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
''}
''}
# Delete our temp keychain

25
pkgs/development/mobile/xcodeenv/install.html.template Normal file
View File

@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<title>Install IPA</title>
</head>
<body>
<a id="forwardlink" href="@INSTALL_URL@">Go to the install page or wait a second</a>
<script type="text/javascript">
setTimeout(function() {
var link = document.getElementById('forwardlink');
if(document.createEvent) {
var eventObj = document.createEvent('MouseEvents');
eventObj.initEvent('click', true, false);
link.dispatchEvent(eventObj);
} else if(document.createEventObject) {
link.fireEvent('onclick');
}
}, 1000);
</script>
</body>
</html>