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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-06-13 11:02:21 +02:00
parent 98f95ef9c4 0905a5d990
commit 1523382160
201 changed files with 1867 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/attract-mode/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg
{ expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg
, libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib
expat ffmpeg_3 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib
];
meta = with stdenv.lib; {
pkgs/misc/emulators/dolphin-emu/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, pkgconfig
, cmake
, bluez
, ffmpeg
, ffmpeg_3
, libao
, gtk2
, glib
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bluez
ffmpeg
ffmpeg_3
libao
libGLU
libGL
pkgs/misc/emulators/dolphin-emu/master.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
, wrapQtAppsHook, qtbase, bluez, ffmpeg_3, 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
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
++ lib.optional stdenv.isLinux wrapQtAppsHook;
buildInputs = [
curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio
curl ffmpeg_3 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
pkgs/misc/emulators/mgba/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig
, cmake, epoxy, libzip, libelf, libedit, ffmpeg, SDL2, imagemagick
, cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick
, qtbase, qtmultimedia, qttools, minizip }:
let
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ];
buildInputs = [
epoxy libzip libelf libedit ffmpeg SDL2 imagemagick
epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick
qtbase qtmultimedia qttools minizip
];
pkgs/misc/emulators/ppsspp/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ SDL2
, cmake
, fetchFromGitHub
, ffmpeg
, ffmpeg_3
, glew
, lib
, libzip
@@ -37,7 +37,7 @@ mkDerivation rec {
buildInputs = [
SDL2
ffmpeg
ffmpeg_3
glew
libzip
qtbase
pkgs/misc/emulators/retroarch/cores.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch
, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
, buildPackages }:
@@ -834,7 +834,7 @@ in with stdenv.lib.licenses;
description = "ppsspp libretro port";
license = gpl2;
extraNativeBuildInputs = [ cmake pkgconfig ];
extraBuildInputs = [ libGLU libGL libzip ffmpeg python37 snappy xorg.libX11 ];
extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ];
makefile = "Makefile";
cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ];
postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
pkgs/misc/emulators/retroarch/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper
, ffmpeg, libGLU, libGL, freetype, libxml2, python3
, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3
, libobjc, AppKit, Foundation
, alsaLib ? null
, libdrm ? null
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wayland ]
++ optional withVulkan makeWrapper;
buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ]
buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ]
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan vulkan-loader
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
pkgs/misc/emulators/rpcs3/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git
, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python3
, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg_3, libevdev, python3
, pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib
@@ -36,7 +36,7 @@ mkDerivation {
nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = [
qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python3
qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg_3 libevdev python3
] ++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland;
pkgs/misc/lightspark/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg, glew, pcre
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre
, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm
, llvm, glibmm
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [
curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
gnome2.pango lzma nasm llvm glibmm
];
pkgs/misc/scrcpy/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@
, fetchpatch
, platform-tools
, ffmpeg
, ffmpeg_3
, SDL2
}:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper meson ninja pkg-config ];
buildInputs = [ ffmpeg SDL2 ];
buildInputs = [ ffmpeg_3 SDL2 ];
# Manually install the server jar to prevent Meson from "fixing" it
preConfigure = ''