lol

fpc: add support for aarch64-linux

Supported since fpc 3.2.0.

+15 -1
+5
pkgs/development/compilers/fpc/binary.nix
··· 15 15 url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar"; 16 16 sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni"; 17 17 } 18 + else if stdenv.hostPlatform.system == "aarch64-linux" then 19 + fetchurl { 20 + url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; 21 + sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71"; 22 + } 18 23 else throw "Not supported on ${stdenv.hostPlatform.system}."; 19 24 20 25 builder = ./binary-builder.sh;
+10 -1
pkgs/development/compilers/fpc/mark-paths.patch
··· 1 1 diff --git a/fpcsrc/compiler/systems/t_linux.pas b/fpcsrc/compiler/systems/t_linux.pas 2 - index a7398fb9..a1e41ecb 100644 2 + index a7398fb9..8e46fec0 100644 3 3 --- a/fpcsrc/compiler/systems/t_linux.pas 4 4 +++ b/fpcsrc/compiler/systems/t_linux.pas 5 5 @@ -135,13 +135,13 @@ begin ··· 19 19 {$else powerpc64} 20 20 LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); 21 21 {$endif powerpc64} 22 + @@ -164,7 +164,7 @@ begin 23 + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true); 24 + {$endif i386} 25 + {$ifdef aarch64} 26 + - LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true); 27 + + LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true); 28 + {$endif aarch64} 29 + {$ifdef powerpc} 30 + LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true); 22 31 @@ -185,53 +185,53 @@ begin 23 32 end; 24 33