fpc: 3.0.4 -> 3.2.0

There was no 3.1 for some reason. The old sed-based path patching was
broken and resulted in syntax errors since it was a bit over-eager.
Instead of fixing it, I decided to replace it with a patch file which is
easier to inspect and will fail in a more obvious way next time.

The patch is now applied unconditionally, since it actually applies to
all linux platforms. The changes are localized to linux-specific code,
so it does not hurt to apply it on non-linux platforms as well.

Hedgewars needs a small fix to work with the new version. Done in the
same commit to avoid a broken commit.
This commit is contained in:
Timo Kaufmann
2020-09-03 14:52:18 +02:00
parent 596de92ca7
commit f928b91f34
5 changed files with 155 additions and 20 deletions
+8 -7
View File
@@ -1,18 +1,19 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "fpc-3.0.0-binary";
stdenv.mkDerivation rec {
pname = "fpc-binary";
version = "3.2.0";
src =
if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.i386-linux.tar";
sha256 = "0h3f1dgs1zsx7vvk9kg67anjvgw5sslfbmjblif7ishbcp3k3g5k";
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar";
sha256 = "0y0510b2fbxbqz28967xx8b023k6q9fv5yclfrc1yc9mg8fyn411";
}
else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.x86_64-linux.tar";
sha256 = "1m2xx3nda45cb3zidbjgdr8kddd19zk0khvp7xxdlclszkqscln9";
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar";
sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni";
}
else throw "Not supported on ${stdenv.hostPlatform.system}.";
@@ -21,4 +22,4 @@ stdenv.mkDerivation {
meta = {
description = "Free Pascal Compiler from a binary distribution";
};
}
}