Unverified Commit 864914bd authored by Sefa Eyeoglu's avatar Sefa Eyeoglu Committed by GitHub
Browse files

ddnet: fix x86 darwin (#355675)

parents 7e22abae a4c1840b

pkgs/games/ddnet/default.nix

+66 −61
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cargo

, cmake

, ninja

, pkg-config

, rustPlatform

, rustc

, curl

, freetype

, libGLU

, libnotify

, libogg

, libX11

, opusfile

, pcre

, python3

, SDL2

, sqlite

, wavpack

, ffmpeg

, x264

, vulkan-headers

, vulkan-loader

, glslang

, spirv-tools

, gtest

, Carbon

, Cocoa

, OpenGL

, Security

, buildClient ? true

{

  lib,

  stdenv,

  fetchFromGitHub,

  cargo,

  cmake,

  ninja,

  pkg-config,

  rustPlatform,

  rustc,

  apple-sdk_11,

  curl,

  freetype,

  libGLU,

  libnotify,

  libogg,

  libX11,

  opusfile,

  pcre,

  python3,

  SDL2,

  sqlite,

  wavpack,

  ffmpeg,

  x264,

  vulkan-headers,

  vulkan-loader,

  glslang,

  spirv-tools,

  gtest,

  buildClient ? true,

}:



stdenv.mkDerivation rec {
@@ -63,13 +61,16 @@ stdenv.mkDerivation rec { 
    gtest

  ];



  buildInputs = [

  buildInputs =

    [

      curl

      libnotify

      pcre

      python3

      sqlite

  ] ++ lib.optionals buildClient ([

    ]

    ++ lib.optionals buildClient (

      [

        freetype

        libGLU

        libogg
@@ -82,14 +83,14 @@ stdenv.mkDerivation rec { 
        vulkan-headers

        glslang

        spirv-tools

  ] ++ lib.optionals stdenv.hostPlatform.isLinux [

      ]

      ++ lib.optionals stdenv.hostPlatform.isLinux [

        libX11

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    Carbon

    Cocoa

    OpenGL

    Security

  ]);

      ]

      ++ lib.optionals stdenv.hostPlatform.isDarwin [

        apple-sdk_11

      ]

    );



  postPatch = ''

    substituteInPlace src/engine/shared/storage.cpp \
@@ -130,7 +131,11 @@ stdenv.mkDerivation rec { 
    '';

    homepage = "https://ddnet.org";

    license = licenses.asl20;

    maintainers = with maintainers; [ sirseruju lom ncfavier ];

    maintainers = with maintainers; [

      sirseruju

      lom

      ncfavier

    ];

    mainProgram = "DDNet";

  };

}

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -17023,9 +17023,7 @@ with pkgs; 
  deliantra-maps = callPackage ../games/deliantra/maps.nix { };

  deliantra-data = callPackage ../games/deliantra/data.nix { };













  ddnet = callPackage ../games/ddnet {













    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security;













  };













  ddnet = callPackage ../games/ddnet {};















  ddnet-server = ddnet.override { buildClient = false; };





























  devilutionx = callPackage ../games/devilutionx {