diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-21 10:55:55 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-21 13:29:54 +1000 |
commit | 932941b79c3dbbef2de9440e1631dfec43956261 (patch) | |
tree | 2143233842853662246d1b88a8a50797b98de69e /pkgs/development/compilers | |
parent | fa2e1dd70a3cad3f018c5c29ca9bee429cdea9f6 (diff) | |
download | nixpkgs-932941b79c3dbbef2de9440e1631dfec43956261.tar nixpkgs-932941b79c3dbbef2de9440e1631dfec43956261.tar.gz nixpkgs-932941b79c3dbbef2de9440e1631dfec43956261.tar.bz2 nixpkgs-932941b79c3dbbef2de9440e1631dfec43956261.tar.lz nixpkgs-932941b79c3dbbef2de9440e1631dfec43956261.tar.xz nixpkgs-932941b79c3dbbef2de9440e1631dfec43956261.tar.zst nixpkgs-932941b79c3dbbef2de9440e1631dfec43956261.zip |
treewide: editorconfig fixes
- remove trailing whitespace - use spaces for indentation
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/apache-flex-sdk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/bigloo/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/opendylan/bin.nix | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix index ed6b2b2ff24..337d5a4e26d 100644 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -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; { diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index a3bac2b1722..ced7dd07a22 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -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"; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index dbe7e44b1d7..7636b251e62 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -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 |