Unverified Commit cc5586f8 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #236677 from wegank/xconq-darwin 

xconq: add darwin support
parents 3ea10b9d 97a5d1c9

pkgs/games/xconq/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -37383,10 +37383,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 { };