diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
| commit | 765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch) | |
| tree | c130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/games | |
| parent | 690a8017de9f9e9bed8609c1798d6d4309d9794a (diff) | |
| parent | cad8fc3447372043c4a098a3104a03f4990058e4 (diff) | |
| download | nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2 nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip | |
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/warmux/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/games/warzone2100/default.nix | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index a56afbbf44b5..29e8042ac7ac 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { gettext intltool libtool perl ]; + preConfigure = '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ + ''; + configureFlagsArray = ("CFLAGS=-include ${zlib.dev}/include/zlib.h"); patches = [ ./gcc-fix.patch ]; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 6165cacfdca5..65e5669d86a6 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { --replace "which %s" "${which}/bin/which %s" ''; + preConfigure = '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ + ''; + configureFlags = [ "--with-distributor=NixOS" ]; hardeningDisable = [ "format" ]; |