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: 9e58c8363b08
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 189d14856c96
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 23, 2020

  1. mednafen: Add alsaLib to get ALSA audio output

    @DamienCassou
    DamienCassou committed Apr 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a3f35c0 View commit details

  2. Merge pull request #85506 from DamienCassou/damien/mednafen-with-alsa 

    mednafen: Add alsaLib to get ALSA audio output
    @Mic92
    Mic92 authored Apr 23, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    189d148 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/misc/emulators/mednafen/default.nix
3 changes: 2 additions & 1 deletion pkgs/misc/emulators/mednafen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2
, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }:
, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }:

stdenv.mkDerivation rec {
pname = "mednafen";
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
libGLU libGL
libcdio
libjack2
alsaLib
libsamplerate
libsndfile
libX11