From 97a5d1c93afc02b2b29e13fd7449855576b5504e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Jun 2023 17:57:33 +0300 Subject: [PATCH] xconq: add darwin support --- pkgs/games/xconq/default.nix | 10 ++++++++-- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix index ee6748676bd3..78a7949d1a91 100644 --- a/pkgs/games/xconq/default.nix +++ b/pkgs/games/xconq/default.nix @@ -19,7 +19,13 @@ stdenv.mkDerivation rec { "--with-tkconfig=${tk}/lib" ]; - CXXFLAGS = " --std=c++11 "; + env.CXXFLAGS = toString [ + "-std=c++11" + "-DUSE_INTERP_RESULT" + "-Wno-writable-strings" + ]; + + enableParallelBuilding = true; hardeningDisable = [ "format" ]; @@ -49,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A programmable turn-based strategy game"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68f9f4b56ff2..a2b243f3867b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37379,10 +37379,7 @@ with pkgs; xbomb = callPackage ../games/xbomb { }; - xconq = callPackage ../games/xconq { - tcl = tcl-8_5; - tk = tk-8_5; - }; + xconq = callPackage ../games/xconq { }; xcowsay = callPackage ../games/xcowsay { };