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:
@@ -1,7 +1,26 @@
|
||||
{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig
|
||||
, lua, fpc, pcre, portaudio, freetype, libpng
|
||||
, SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf
|
||||
, ffmpeg, sqlite, zlib, libX11, libGLU, libGL }:
|
||||
{ stdenv
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkgconfig
|
||||
, lua
|
||||
, fpc
|
||||
, pcre
|
||||
, portaudio
|
||||
, freetype
|
||||
, libpng
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_gfx
|
||||
, SDL2_mixer
|
||||
, SDL2_net, SDL2_ttf
|
||||
, ffmpeg
|
||||
, sqlite
|
||||
, zlib
|
||||
, libX11
|
||||
, libGLU
|
||||
, libGL
|
||||
}:
|
||||
|
||||
let
|
||||
sharedLibs = [
|
||||
@@ -23,6 +42,14 @@ in stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ fpc libpng ] ++ sharedLibs;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fpc-3.2-support.patch";
|
||||
url = "https://github.com/UltraStar-Deluxe/USDX/commit/1b8e8714c1523ef49c2fd689a1545d097a3d76d7.patch";
|
||||
sha256 = "02zmjymj9w1mkpf7armdpf067byvml6lprs1ca4lhpkv45abddp4";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/config.inc.in \
|
||||
--subst-var-by libpcre_LIBNAME libpcre.so.1
|
||||
|
||||
Reference in New Issue
Block a user