zoom: fix gcc5 build
https://hydra.nixos.org/build/33122239/nixlog/1/raw
This commit is contained in:
parent
6448c94e57
commit
a4ed052407
|
@ -2,21 +2,26 @@
|
||||||
|
|
||||||
# !!! assert freetype == xorg.freetype
|
# !!! assert freetype == xorg.freetype
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "zoom-1.1.5";
|
name = "zoom-1.1.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://www.logicalshift.co.uk/unix/zoom/zoom-1.1.5.tar.gz;
|
url = "http://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz";
|
||||||
sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
|
sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ perl expat xlibsWrapper freetype ];
|
buildInputs = [ perl expat xlibsWrapper freetype ];
|
||||||
|
|
||||||
# Zoom doesn't add the right directory in the include path.
|
NIX_CFLAGS_COMPILE = [
|
||||||
CFLAGS = [ "-I" (freetype + "/include/freetype2") ];
|
# Zoom doesn't add the right directory in the include path.
|
||||||
|
"-I" (freetype + "/include/freetype2")
|
||||||
|
|
||||||
|
# for gcc5; c11 inline semantics breaks the build
|
||||||
|
"-fgnu89-inline"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Player for Z-Code, TADS and HUGO stories or games, usually text adventures ('interactive fiction')";
|
description = "Player for Z-Code, TADS and HUGO stories or games";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Zoom is a player for Z-Code, TADS and HUGO stories or games. These are
|
Zoom is a player for Z-Code, TADS and HUGO stories or games. These are
|
||||||
usually text adventures ('interactive fiction'), and were first created
|
usually text adventures ('interactive fiction'), and were first created
|
||||||
|
|
Loading…
Reference in a new issue