treewide: editorconfig fixes

- remove trailing whitespace
- use spaces for indentation
This commit is contained in:
zowoq
2021-01-21 13:29:54 +10:00
parent fa2e1dd70a
commit 932941b79c
32 changed files with 74 additions and 75 deletions
@@ -38,13 +38,13 @@ in stdenv.mkDerivation rec {
for i in $out/bin/!(aasdoc|acompc|amxmlc); do
wrapProgram $i \
--set FLEX_HOME $t \
--set PLAYERGLOBAL_HOME $t/frameworks/libs/player/
--set PLAYERGLOBAL_HOME $t/frameworks/libs/player/
done
mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/
cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
'';
fixupPhase = ":";
meta = with stdenv.lib; {
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
# Fix absolute paths.
sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \
-e 's=/tmp=$TMPDIR=g' -i autoconf/* \
[Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \
*/*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \
comptime/Cc/cc.scm gc/install-*
[Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \
*/*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \
comptime/Cc/cc.scm gc/install-*
# Make sure we don't change string lengths in the generated
# C files.
sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \
-i comptime/Cc/cc.c
-i comptime/Cc/cc.c
'';
checkTarget = "test";
+2 -2
View File
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
tar --strip-components=1 -xjf "$src" -C "$out"
interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
for a in "$out"/bin/*; do
for a in "$out"/bin/*; do
patchelf --set-interpreter "$interpreter" "$a"
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done
for a in "$out"/lib/*.so; do
for a in "$out"/lib/*.so; do
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done
sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam