ddnet: 16.3.1 -> 16.3.2

This commit is contained in:
Heinz Deinhart 2022-09-05 12:10:50 +02:00 committed by Sandro Jäckel
parent 4c1f1c5853
commit f906897d4b
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 12 additions and 4 deletions

View File

@ -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;
};
}

View File

@ -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 {