alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

dolphinEmu: replace ffmpeg_3 with ffmpeg

Browse source
This commit is contained in:
TredwellGit 2021-02-11 05:55:41 +00:00
parent 30cbff7820
commit 6464b64cb7
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/misc/lutris/fhsenv.nix
View file

@ -28,7 +28,7 @@ in buildFHSUserEnv {
# DGen // TODO: libarchive is broken # DGen // TODO: libarchive is broken
# Dolphin # Dolphin
bluez ffmpeg_3 gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
wavpack orc nettle gmp pcre vulkan-loader wavpack orc nettle gmp pcre vulkan-loader
# DOSBox # DOSBox

4
pkgs/misc/emulators/dolphin-emu/default.nix
View file

@ -4,7 +4,7 @@
, pkg-config , pkg-config
, cmake , cmake
, bluez , bluez
, ffmpeg_3 , ffmpeg
, libao , libao
, gtk2 , gtk2
, glib , glib
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bluez bluez
ffmpeg_3 ffmpeg
libao libao
libGLU libGLU
libGL libGL

4
pkgs/misc/emulators/dolphin-emu/master.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake { 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 , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib
, miniupnpc, enet, mbedtls, soundtouch, sfml , miniupnpc, enet, mbedtls, soundtouch, sfml
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
++ lib.optional stdenv.isLinux wrapQtAppsHook; ++ lib.optional stdenv.isLinux wrapQtAppsHook;
buildInputs = [ 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 libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml
qtbase qtbase