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

reewide: Purge all uses stdenv.system and top-level system

Browse Source 
It is deprecated and will be removed after 18.09.
This commit is contained in:
John Ericson
2018-08-20 15:11:29 -04:00
parent 94f71d800d
commit 2c2f1e37d4
263 changed files with 594 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/mobile/titaniumenv/build-app.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
name = stdenv.lib.replaceChars [" "] [""] name;
inherit src;
buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") xcodewrapper;
buildPhase = ''
${preBuild}

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

@@ -3,7 +3,7 @@
rec {
androidenv = pkgs.androidenv;
xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv.override {
xcodeenv = if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then pkgs.xcodeenv.override {
version = xcodeVersion;
inherit xcodeBaseDir;
} else null;

12
pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
View File

@@ -2,15 +2,15 @@
stdenv.mkDerivation {
name = "mobilesdk-6.3.1.GA";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl {
url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-linux.zip;
sha256 = "0g8dqqf5ffa7ll3rqm5naywipnv2vvfxcj9fmqg1wnvvxf0rflqj";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-osx.zip;
sha256 = "00bm8vv70mg4kd7jvmxd1bfqafv6zdpdx816i0hvf801zwnak4nj";
}
else throw "Platform: ${stdenv.system} not supported!";
else throw "Platform: ${stdenv.hostPlatform.system} not supported!";
buildInputs = [ unzip makeWrapper ];
@@ -23,18 +23,18 @@ stdenv.mkDerivation {
cd mobilesdk/*
mv * 6.3.1.GA
cd *
${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") ''
# Fixes a bad archive copying error when generating an IPA file
sed -i -e "s|cp -rf|/bin/cp -rf|" iphone/cli/commands/_build.js
''}
# Patch some executables
${if stdenv.system == "i686-linux" then
${if stdenv.hostPlatform.system == "i686-linux" then
''
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
''
else if stdenv.system == "x86_64-linux" then
else if stdenv.hostPlatform.system == "x86_64-linux" then
''
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
''

10
pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
View File

@@ -54,15 +54,15 @@ let
in
stdenv.mkDerivation {
name = "mobilesdk-7.1.0.GA";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl {
url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip;
sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip;
sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m";
}
else throw "Platform: ${stdenv.system} not supported!";
else throw "Platform: ${stdenv.hostPlatform.system} not supported!";
buildInputs = [ unzip makeWrapper ];
@@ -89,11 +89,11 @@ stdenv.mkDerivation {
# Patch some executables
${if stdenv.system == "i686-linux" then
${if stdenv.hostPlatform.system == "i686-linux" then
''
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
''
else if stdenv.system == "x86_64-linux" then
else if stdenv.hostPlatform.system == "x86_64-linux" then
''
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
''