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

Use patchShebangs instead of obsolete shebangfix

Browse Source
This commit is contained in:
Eelco Dolstra 2012-11-08 16:49:36 +01:00
parent e89eab8893
commit 140d91fdc9
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/androidenv/androidsdk.nix
View File

@ -1,4 +1,4 @@
{ stdenv, stdenv_32bit, fetchurl, unzip, shebangfix, makeWrapper { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
, platformTools, support, platforms, sysimages, addons , platformTools, support, platforms, sysimages, addons
, zlib_32bit , zlib_32bit
, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit
@ -54,14 +54,9 @@ stdenv.mkDerivation {
--prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib
done done
''} ''}
# These are shell scripts with a reference to #!/bin/bash, which must be patched
for i in ddms draw9patch monkeyrunner monitor lint traceview
do
shebangfix $i
done
patchShebangs .
${if stdenv.system == "i686-linux" then ${if stdenv.system == "i686-linux" then
'' ''
# The monitor requires some more patching # The monitor requires some more patching
@ -158,7 +153,7 @@ stdenv.mkDerivation {
then then
( echo '#! ${stdenv.shell} -e' ( echo '#! ${stdenv.shell} -e'
echo "cd $out/libexec/android-sdk-*/tools" echo "cd $out/libexec/android-sdk-*/tools"
echo "./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i) echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i)
chmod +x $out/bin/$(basename $i) chmod +x $out/bin/$(basename $i)
fi fi
@ -177,5 +172,5 @@ stdenv.mkDerivation {
done done
''; '';
buildInputs = [ shebangfix unzip makeWrapper ]; buildInputs = [ unzip makeWrapper ];
} }

4
pkgs/development/androidenv/default.nix
View File

@ -2,7 +2,7 @@
rec { rec {
platformTools = import ./platform-tools.nix { platformTools = import ./platform-tools.nix {
inherit (pkgs) stdenv fetchurl unzip shebangfix; inherit (pkgs) stdenv fetchurl unzip;
inherit (pkgs_i686) zlib ncurses; inherit (pkgs_i686) zlib ncurses;
stdenv_32bit = pkgs_i686.stdenv; stdenv_32bit = pkgs_i686.stdenv;
}; };
@ -30,7 +30,7 @@ rec {
}; };
androidsdk = import ./androidsdk.nix { androidsdk = import ./androidsdk.nix {
inherit (pkgs) stdenv fetchurl unzip shebangfix makeWrapper; inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) freetype fontconfig gtk atk; inherit (pkgs) freetype fontconfig gtk atk;
inherit (pkgs.xorg) libX11 libXext libXrender; inherit (pkgs.xorg) libX11 libXext libXrender;

6
pkgs/development/androidenv/platform-tools.nix
View File

@ -1,4 +1,4 @@
{stdenv, stdenv_32bit, fetchurl, unzip, shebangfix, zlib, ncurses}: {stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "android-platform-tools-r15_rc7"; name = "android-platform-tools-r15_rc7";
@ -34,8 +34,8 @@ stdenv.mkDerivation {
patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc
''} ''}
shebangfix dx patchShebangs .
''; '';
buildInputs = [ unzip shebangfix ]; buildInputs = [ unzip ];
} }