Skip to content

Commit e4b43e2

Browse files
quesoglc: unbreak, modernize (NixOS#396967)
2 parents aff3966 + b4d398b commit e4b43e2

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

pkgs/by-name/qu/quesoglc/package.nix

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
fribidi,
1111
libX11,
1212
}:
13-
stdenv.mkDerivation rec {
13+
stdenv.mkDerivation (finalAttrs: {
1414
pname = "quesoglc";
1515
version = "0.7.2";
16+
1617
src = fetchurl {
17-
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
18-
sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl";
18+
url = "mirror://sourceforge/quesoglc/quesoglc-${finalAttrs.version}.tar.bz2";
19+
hash = "sha256-VP7y7mhRct80TQb/RpmkQRQ7h6vtDVFFJK3E+JukyTE=";
1920
};
21+
2022
buildInputs = [
2123
libGLU
2224
libGL
@@ -26,8 +28,18 @@ stdenv.mkDerivation rec {
2628
fribidi
2729
libX11
2830
];
31+
32+
# required for cross builds
33+
configureFlags = [
34+
"ac_cv_func_malloc_0_nonnull=yes"
35+
"ac_cv_func_realloc_0_nonnull=yes"
36+
"ac_cv_func_memcmp_working=yes"
37+
];
38+
39+
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
40+
2941
# FIXME: Configure fails to use system glew.
30-
meta = with lib; {
42+
meta = {
3143
description = "Free implementation of the OpenGL Character Renderer";
3244
longDescription = ''
3345
QuesoGLC is a free (as in free speech) implementation of the OpenGL
@@ -36,8 +48,8 @@ stdenv.mkDerivation rec {
3648
platform that supports both FreeType and the OpenGL API.
3749
'';
3850
homepage = "https://quesoglc.sourceforge.net/";
39-
license = licenses.lgpl21Plus;
40-
maintainers = with maintainers; [ astsmtl ];
41-
platforms = platforms.linux;
51+
license = lib.licenses.lgpl21Plus;
52+
maintainers = with lib.maintainers; [ astsmtl ];
53+
platforms = lib.platforms.linux;
4254
};
43-
}
55+
})

0 commit comments

Comments
 (0)