public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112721 from TredwellGit/dolphinEmu

Browse Source 
dolphinEmu: replace ffmpeg_3 with ffmpeg
This commit is contained in:
Sandro
2021-02-12 16:32:21 +01:00
committed by GitHub
parent 8374c660fe 6464b64cb7
commit 4fc50b8612
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/lutris/fhsenv.nix
+1 -1
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
pkgs/misc/emulators/dolphin-emu/default.nix
+2 -2
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
pkgs/misc/emulators/dolphin-emu/master.nix
+2 -2
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