diff options
| author | DarkScythe97 <darknx97@gmail.com> | 2018-03-04 09:39:44 +1030 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-03-04 21:25:56 +0100 |
| commit | 6a92260227e469098623253a1ae527b2d3a73570 (patch) | |
| tree | 56a4ab62e789192435d2d67c274c1aedde715741 | |
| parent | e604a3175dcb563d21b27ae546591c86fb01a878 (diff) | |
| download | nixlib-6a92260227e469098623253a1ae527b2d3a73570.tar nixlib-6a92260227e469098623253a1ae527b2d3a73570.tar.gz nixlib-6a92260227e469098623253a1ae527b2d3a73570.tar.bz2 nixlib-6a92260227e469098623253a1ae527b2d3a73570.tar.lz nixlib-6a92260227e469098623253a1ae527b2d3a73570.tar.xz nixlib-6a92260227e469098623253a1ae527b2d3a73570.tar.zst nixlib-6a92260227e469098623253a1ae527b2d3a73570.zip | |
retroarch: fix darwin build
| -rw-r--r-- | pkgs/misc/emulators/retroarch/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 3b160c46c912..c7c9bf08c713 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99232bf8ea30..005a1fd42286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |