Unverified Commit c05b8578 authored by GnomedDev's avatar GnomedDev
Browse files

dolphin-emu,sfml: Fix build on Darwin by vendoring miniaudio

parent ac4aa734

pkgs/by-name/do/dolphin-emu/package.nix

+0 −4
Original line number Diff line number Diff line
@@ -198,10 +198,6 @@ stdenv.mkDerivation (finalAttrs: { 
    branch = "master";

    license = lib.licenses.gpl2Plus;

    platforms = lib.platforms.unix;

    badPlatforms = [

      # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'

      lib.systems.inspect.patterns.isDarwin

    ];

    maintainers = with lib.maintainers; [ pbsds ];

  };

})

pkgs/by-name/sf/sfml/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-YqlrY0iIsxcjlLb+buMU0zpXo7/eKSKxOsITWf7BX6s=";

  };



  patches = [

  # Only unvendor miniaudio on non-Darwin as Darwin cannot build the miniaudio package.

  patches = lib.optional (!stdenv.hostPlatform.isDarwin) [

    # Not upstreamble in the near future, see https://github.com/SFML/SFML/pull/3555

    ./unvendor-miniaudio.patch

  ];
@@ -49,10 +50,10 @@ stdenv.mkDerivation (finalAttrs: { 
    glew

    libjpeg

    libvorbis

    miniaudio

  ]

  ++ lib.optional stdenv.hostPlatform.isLinux udev

  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

    miniaudio

    libx11

    libxi

    libxcursor