mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 22:03:54 +03:00
zoom: fix gcc5 build
https://hydra.nixos.org/build/33122239/nixlog/1/raw
(cherry picked from commit a4ed052407
)
This commit is contained in:
parent
916531dfd1
commit
84fbe0d6d7
@ -2,21 +2,26 @@
|
||||
|
||||
# !!! assert freetype == xorg.freetype
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zoom-1.1.5";
|
||||
|
||||
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";
|
||||
};
|
||||
|
||||
buildInputs = [ perl expat xlibsWrapper freetype ];
|
||||
|
||||
# Zoom doesn't add the right directory in the include path.
|
||||
CFLAGS = [ "-I" (freetype + "/include/freetype2") ];
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# 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; {
|
||||
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 = ''
|
||||
Zoom is a player for Z-Code, TADS and HUGO stories or games. These are
|
||||
usually text adventures ('interactive fiction'), and were first created
|
||||
|
Loading…
Reference in New Issue
Block a user