Merge pull request #189833 from atemp/emp_ddnet_16.3

ddnet: 16.3.1 -> 16.3.2

authored by

Christian Kögler and committed by
GitHub
56d93547 b9ec2ed7

+12 -4
+9 -3
pkgs/games/ddnet/default.nix
··· 22 22 , vulkan-loader 23 23 , glslang 24 24 , spirv-tools 25 + , Carbon 26 + , Cocoa 27 + , OpenGL 28 + , Security 25 29 }: 26 30 27 31 stdenv.mkDerivation rec { 28 32 pname = "ddnet"; 29 - version = "16.3.1"; 33 + version = "16.3.2"; 30 34 31 35 src = fetchFromGitHub { 32 36 owner = "ddnet"; 33 37 repo = pname; 34 38 rev = version; 35 - sha256 = "sha256-0SkTIpCnoEbu1sOagYjHBHj1I3EgLwJ8sYxWqnJGYLc="; 39 + sha256 = "sha256-VvMcb3Im071MZmOvTOu7zRNKcp5dSJGS3kMvTLD/sFQ="; 36 40 }; 37 41 38 42 nativeBuildInputs = [ cmake ninja pkg-config ]; ··· 56 60 vulkan-headers 57 61 glslang 58 62 spirv-tools 59 - ]; 63 + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; 60 64 61 65 cmakeFlags = [ 62 66 "-DCMAKE_BUILD_TYPE=Release" ··· 82 86 license = licenses.asl20; 83 87 maintainers = with maintainers; [ sirseruju lom ]; 84 88 mainProgram = "DDNet"; 89 + # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' 90 + broken = stdenv.isDarwin; 85 91 }; 86 92 }
+3 -1
pkgs/top-level/all-packages.nix
··· 33230 33230 stdenv = gcc10StdenvCompat; 33231 33231 }; 33232 33232 33233 - ddnet = callPackage ../games/ddnet { }; 33233 + ddnet = callPackage ../games/ddnet { 33234 + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security; 33235 + }; 33234 33236 33235 33237 devilutionx = callPackage ../games/devilutionx { 33236 33238 SDL2 = SDL2.override {