From d0888d150333a2c523cd1e46606d6219afe23dc2 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 21 Aug 2018 12:05:01 +0200 Subject: treewide: fixup breakage due to absolute compiler path Some packages just can't handle them #44767. It was tempting to try to abstract this in some way, but I didn't do that ATM. --- pkgs/games/warmux/default.nix | 5 +++++ pkgs/games/warzone2100/default.nix | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'pkgs/games') 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" ]; -- cgit 1.4.1