Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d0aec3b1d4b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08a897676b2b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 16, 2019

  1. retroarch: 1.7.8.4 -> 1.8.1

    @WayaOS @bjornfor
    WayaOS authored and bjornfor committed Nov 16, 2019
    Copy the full SHA
    08a8976 View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/misc/emulators/retroarch/default.nix
12 changes: 8 additions & 4 deletions pkgs/misc/emulators/retroarch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,14 @@
, ffmpeg, libGLU_combined, freetype, libxml2, python3
, libobjc, AppKit, Foundation
, alsaLib ? null
, libdrm ? null
, libpulseaudio ? null
, libv4l ? null
, libX11 ? null
, libXdmcp ? null
, libXext ? null
, libXxf86vm ? null
, mesa ? null
, SDL2 ? null
, udev ? null
, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
@@ -27,12 +29,12 @@ let

in stdenv.mkDerivation rec {
pname = "retroarch-bare";
version = "1.7.8.4";
version = "1.8.1";

src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph";
sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7";
rev = "v${version}";
};

@@ -43,11 +45,13 @@ in stdenv.mkDerivation rec {
++ 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 ];
++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm mesa udev ];

enableParallelBuilding = true;

configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else "";

postInstall = optionalString withVulkan ''
wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
'' + optionalString stdenv.targetPlatform.isDarwin ''