JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

retroarch: fix darwin build

Browse Source
This commit is contained in:
DarkScythe97 2018-03-04 09:39:44 +10:30 committed by Daiderd Jordan
parent e604a3175d
commit 6a92260227
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/emulators/retroarch/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
, ffmpeg, mesa, freetype, libxml2, python34
, libobjc, AppKit, Foundation
, alsaLib ? null
, libpulseaudio ? null
, libv4l ? null
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ffmpeg freetype libxml2 mesa python34 SDL2 which ]
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan [ vulkan-loader ]
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
++ optionals stdenv.isLinux [ alsaLib libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm udev ];

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

@ -20350,7 +20350,10 @@ with pkgs;
redprl = callPackage ../applications/science/logic/redprl { };
retroarchBare = callPackage ../misc/emulators/retroarch { };
retroarchBare = callPackage ../misc/emulators/retroarch {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
};
retroarch = wrapRetroArch { retroarch = retroarchBare; };