diff options
Diffstat (limited to 'pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix')
| -rw-r--r-- | pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix index 2ac4040714b..47414e205a0 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out cd $out - yes y | unzip $src + unzip $src # Fix shebang header for python scripts @@ -44,11 +44,11 @@ stdenv.mkDerivation { ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 '' else ""} @@ -61,7 +61,7 @@ stdenv.mkDerivation { import os, sys os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)' - os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}' + os.environ['JAVA_HOME'] = '${jdk.home}' os.execv('$(pwd)/.builder.py', sys.argv) EOF |