ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #189833 from atemp/emp_ddnet_16.3

Browse Source 
ddnet: 16.3.1 -> 16.3.2
This commit is contained in:
Christian Kögler 2022-09-18 16:23:03 +02:00 committed by GitHub
commit 56d93547f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/games/ddnet/default.nix
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;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -33230,7 +33230,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 {