diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 10:18:30 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-19 10:18:30 +0200 |
| commit | 97c484a10f4b38efc4fb3dd210defed96003ae7d (patch) | |
| tree | 3cf505288a69445d7a0da288197352484942421c /pkgs/games/dwarf-fortress | |
| parent | d133a168f082d2f4c94984190e836e55f5e389a7 (diff) | |
| download | nixlib-97c484a10f4b38efc4fb3dd210defed96003ae7d.tar nixlib-97c484a10f4b38efc4fb3dd210defed96003ae7d.tar.gz nixlib-97c484a10f4b38efc4fb3dd210defed96003ae7d.tar.bz2 nixlib-97c484a10f4b38efc4fb3dd210defed96003ae7d.tar.lz nixlib-97c484a10f4b38efc4fb3dd210defed96003ae7d.tar.xz nixlib-97c484a10f4b38efc4fb3dd210defed96003ae7d.tar.zst nixlib-97c484a10f4b38efc4fb3dd210defed96003ae7d.zip | |
treewide: fix #include errors after gcc-5.4
They were mostly missing <cmath> or <math.h>.
Diffstat (limited to 'pkgs/games/dwarf-fortress')
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/dwarf-fortress/unfuck.nix | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 3d3b1c4d9aa8..1ee0f829571d 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation rec { }; patches = [ ./use-system-libraries.patch ]; + postPatch = "sed '1i#include <math.h>' -i plugins/3dveins.cpp"; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # we can't use native Lua; upstream uses private headers diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 1d6ea1196dab..5b2327c2ff54 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { sha256 = "12bqh3k4wsk1c0bz2zly8h0ilbsdmsbwr9cdjc6i7liwg9906g7i"; }; + postPatch = "sed '1i#include <math.h>' -i g_src/ttf_manager.cpp"; + cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" |