diff options
| author | TredwellGit <tredwell@tutanota.com> | 2021-02-11 05:55:41 +0000 |
|---|---|---|
| committer | TredwellGit <tredwell@tutanota.com> | 2021-02-11 05:55:41 +0000 |
| commit | 6464b64cb778fa930fb53254f7c58ce9f44f8236 (patch) | |
| tree | 9fd43840928305643334092ab741a27f79856e9b /pkgs/misc/emulators | |
| parent | 30cbff78204753101f9f2c2791aa0d2f481c0d45 (diff) | |
| download | nixlib-6464b64cb778fa930fb53254f7c58ce9f44f8236.tar nixlib-6464b64cb778fa930fb53254f7c58ce9f44f8236.tar.gz nixlib-6464b64cb778fa930fb53254f7c58ce9f44f8236.tar.bz2 nixlib-6464b64cb778fa930fb53254f7c58ce9f44f8236.tar.lz nixlib-6464b64cb778fa930fb53254f7c58ce9f44f8236.tar.xz nixlib-6464b64cb778fa930fb53254f7c58ce9f44f8236.tar.zst nixlib-6464b64cb778fa930fb53254f7c58ce9f44f8236.zip | |
dolphinEmu: replace ffmpeg_3 with ffmpeg
Diffstat (limited to 'pkgs/misc/emulators')
| -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 9112293db58a..c2d73d3e7fff 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 4a1fca0e7c5c..cec004e24694 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 |