diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-12 16:32:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 16:32:21 +0100 |
| commit | 4fc50b8612755a048186e64e823a7e7a3c6c3e52 (patch) | |
| tree | a17fb688bf21a5e4686ec056162577b005a4031f /pkgs/misc | |
| parent | 8374c660fe5149b279792bd468f46f5667b685f6 (diff) | |
| parent | 6464b64cb778fa930fb53254f7c58ce9f44f8236 (diff) | |
| download | nixpkgs-4fc50b8612755a048186e64e823a7e7a3c6c3e52.tar nixpkgs-4fc50b8612755a048186e64e823a7e7a3c6c3e52.tar.gz nixpkgs-4fc50b8612755a048186e64e823a7e7a3c6c3e52.tar.bz2 nixpkgs-4fc50b8612755a048186e64e823a7e7a3c6c3e52.tar.lz nixpkgs-4fc50b8612755a048186e64e823a7e7a3c6c3e52.tar.xz nixpkgs-4fc50b8612755a048186e64e823a7e7a3c6c3e52.tar.zst nixpkgs-4fc50b8612755a048186e64e823a7e7a3c6c3e52.zip | |
Merge pull request #112721 from TredwellGit/dolphinEmu
dolphinEmu: replace ffmpeg_3 with ffmpeg
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 9112293db58..c2d73d3e7ff 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -4,7 +4,7 @@ , pkg-config , cmake , bluez -, ffmpeg_3 +, ffmpeg , libao , gtk2 , glib @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez - ffmpeg_3 + ffmpeg libao libGLU libGL diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 4a1fca0e7c5..cec004e2469 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg_3, libao, libGLU, libGL, pcre, gettext +, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ - curl ffmpeg_3 libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio + curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase |