From f906897d4b8829159b27f17accfefddb9ad3effd Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Mon, 5 Sep 2022 12:10:50 +0200 Subject: [PATCH] ddnet: 16.3.1 -> 16.3.2 --- pkgs/games/ddnet/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index ba2050e41b84..29cfa25b8c34 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -22,17 +22,21 @@ , vulkan-loader , glslang , spirv-tools +, Carbon +, Cocoa +, OpenGL +, Security }: stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.3.1"; + version = "16.3.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-0SkTIpCnoEbu1sOagYjHBHj1I3EgLwJ8sYxWqnJGYLc="; + sha256 = "sha256-VvMcb3Im071MZmOvTOu7zRNKcp5dSJGS3kMvTLD/sFQ="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; @@ -56,7 +60,7 @@ stdenv.mkDerivation rec { vulkan-headers glslang spirv-tools - ]; + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -82,5 +86,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ sirseruju lom ]; mainProgram = "DDNet"; + # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5559b619a8e9..c3c31988ada6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32915,7 +32915,9 @@ with pkgs; stdenv = gcc10StdenvCompat; }; - ddnet = callPackage ../games/ddnet { }; + ddnet = callPackage ../games/ddnet { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security; + }; devilutionx = callPackage ../games/devilutionx { SDL2 = SDL2.override {