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: d350a444b7d0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 800c46b24bda
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 1, 2018

  1. dolphinEmuMaster: 20171218 -> 20180430 

    also fix build
    Cray Elliott authored and Cray Elliott committed May 1, 2018
    Copy the full SHA
    800c46b View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/misc/emulators/dolphin-emu/master.nix
10 changes: 5 additions & 5 deletions pkgs/misc/emulators/dolphin-emu/master.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib
, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
, pcre, gettext, libpthreadstubs, libXrandr, libXext, libXxf86vm, libXinerama, libSM, readline
, openal, libXdmcp, portaudio, libusb, libevdev
, libpulseaudio ? null
, curl
@@ -20,12 +20,12 @@ assert dolphin-wxgui || dolphin-qtgui;
assert !(dolphin-wxgui && dolphin-qtgui);

stdenv.mkDerivation rec {
name = "dolphin-emu-20171218";
name = "dolphin-emu-20180430";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa";
sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc";
rev = "ad098283c023b0f5f0d314c646bc5d5756c35e3d";
sha256 = "17fv3vz0nc5jax1bbl4wny1kzsshbbhms82dxd8rzcwwvd2ad1g7";
};

cmakeFlags = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];

buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre
gettext libpthreadstubs libXrandr libXext libSM readline openal
gettext libpthreadstubs libXrandr libXext libXxf86vm libXinerama libSM readline openal
libXdmcp portaudio libusb libpulseaudio libpng hidapi
] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
++ stdenv.lib.optionals stdenv.isLinux [ bluez libevdev ]