Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

bzflag: enable on darwin (#52707)

authored by

Dmitry Kalinkin and committed by
GitHub
98625b2b f21a4733

+8 -4
+5 -3
pkgs/games/bzflag/default.nix
··· 1 1 { stdenv, lib, fetchurl, pkgconfig 2 - , curl, SDL2, libGLU_combined, glew, ncurses, c-ares }: 2 + , curl, SDL2, libGLU_combined, glew, ncurses, c-ares 3 + , Carbon, CoreServices }: 3 4 4 5 stdenv.mkDerivation rec { 5 6 name = "${pname}-${version}"; ··· 12 13 }; 13 14 14 15 nativeBuildInputs = [ pkgconfig ]; 15 - buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ]; 16 + buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ] 17 + ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices ]; 16 18 17 19 meta = with lib; { 18 20 description = "Multiplayer 3D Tank game"; 19 21 homepage = https://bzflag.org/; 20 22 license = licenses.lgpl21Plus; 21 - platforms = platforms.linux; 23 + platforms = platforms.unix; 22 24 maintainers = with maintainers; [ fpletz ]; 23 25 }; 24 26 }
+3 -1
pkgs/top-level/all-packages.nix
··· 20460 20460 20461 20461 btanks = callPackage ../games/btanks { }; 20462 20462 20463 - bzflag = callPackage ../games/bzflag { }; 20463 + bzflag = callPackage ../games/bzflag { 20464 + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; 20465 + }; 20464 20466 20465 20467 cataclysm-dda = callPackage ../games/cataclysm-dda { 20466 20468 inherit (darwin.apple_sdk.frameworks) Cocoa;