From 267ce056f3878a3ab20ac3d36478ff5dc93e63cd Mon Sep 17 00:00:00 2001 From: alina sireneva Date: Tue, 21 May 2024 00:38:52 +0300 Subject: [PATCH 1/2] bugdom: fixed darwin build --- pkgs/games/bugdom/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index 52760d907986..1caa3af8fa0d 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, IOKit, Foundation, cmake, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, SDL2, IOKit, Foundation, OpenGL, cmake, makeWrapper }: stdenv.mkDerivation rec { pname = "bugdom"; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Foundation + OpenGL ]; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce162c99e57e..494d34e3ff58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36527,7 +36527,7 @@ with pkgs; btanks = callPackage ../games/btanks { }; bugdom = callPackage ../games/bugdom { - inherit (darwin.apple_sdk.frameworks) IOKit Foundation; + inherit (darwin.apple_sdk.frameworks) IOKit Foundation OpenGL; }; bzflag = callPackage ../games/bzflag { From 1b5dc7982c301ab4605e0e3bfcda32f02d60181b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 22 May 2024 01:11:53 +0200 Subject: [PATCH 2/2] bugdom: fix build on x86_64-darwin --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 494d34e3ff58..4918f0c9cf74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36527,7 +36527,8 @@ with pkgs; btanks = callPackage ../games/btanks { }; bugdom = callPackage ../games/bugdom { - inherit (darwin.apple_sdk.frameworks) IOKit Foundation OpenGL; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; }; bzflag = callPackage ../games/bzflag {