Merge branch 'master' into staging
* master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
This commit is contained in:
Orivej Desh
@@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11,
|
||||
libXxf86vm, libXcursor, libXpm }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation {
|
||||
name = "fakenes-0.5.9b3";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz;
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
cp fakenes $out/bin
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = "-lX11 -lXxf86vm -lXcursor -lXpm";
|
||||
NIX_LDFLAGS = "-lX11 -lXxf86vm -lXcursor -lXpm";
|
||||
|
||||
patches = [ ./build.patch ];
|
||||
|
||||
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
description = "Portable Open Source NES Emulator";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,29 +1,30 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, mednafen }:
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkgconfig, wrapGAppsHook
|
||||
, gtk2 ? null, gtk3 ? null, mednafen }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "0.8";
|
||||
name = "mednaffe-${version}";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "mednaffe";
|
||||
owner = "AmatCoder";
|
||||
rev = "v${version}";
|
||||
sha256 = "1j4py4ih14fa6dv0hka03rs4mq19ir83qkbxsz3695a4phmip0jr";
|
||||
owner = "AmatCoder";
|
||||
repo = "mednaffe";
|
||||
rev = "v${version}";
|
||||
sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )"
|
||||
'';
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ];
|
||||
buildInputs = [ gtk2 gtk3 mednafen ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ gtk2 mednafen ];
|
||||
configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
|
||||
postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A GTK based frontend for mednafen";
|
||||
meta = {
|
||||
description = "GTK-based frontend for mednafen emulator";
|
||||
homepage = https://github.com/AmatCoder/mednaffe;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.sheenobu ];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sheenobu yegortimoshenko ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,37 +1,43 @@
|
||||
{ stdenv, fetchgit, zlib, libpng, qt4, qmake4Hook, pkgconfig
|
||||
, withGamepads ? true, SDL # SDL is used for gamepad functionality
|
||||
}:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia
|
||||
, glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }:
|
||||
|
||||
assert withGamepads -> (SDL != null);
|
||||
|
||||
let
|
||||
version = "1.3";
|
||||
fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
|
||||
in
|
||||
assert withGamepads -> (SDL2 != null);
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec{
|
||||
name = "PPSSPP-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hrydgard/ppsspp.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ppsspp-${version}";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrydgard";
|
||||
repo = "ppsspp";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0l8vgdlw657r8gv7rz8iqa6zd9zrbzw10pwhcnahzil7w9qrd03g";
|
||||
sha256 = "0m4qkhx7q496sm7ibg2n7rm3npxzfr93iraxgndk0vhfk8vy8w75";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib libpng qt4 ]
|
||||
++ (if withGamepads then [ SDL ] else [ ]);
|
||||
patchPhase = ''
|
||||
echo 'const char *PPSSPP_GIT_VERSION = "${src.rev}";' >> git-version.cpp
|
||||
substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake4Hook ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ qtbase qtmultimedia glew libzip snappy zlib ]
|
||||
++ optionals withGamepads [ SDL2 SDL2.dev ];
|
||||
|
||||
qmakeFlags = [ "PPSSPPQt.pro" ];
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DUSING_QT_UI=ON" ];
|
||||
|
||||
preConfigure = "cd Qt";
|
||||
installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/ppsspp
|
||||
mv PPSSPPQt $out/bin/ppsspp
|
||||
mv assets $out/share/ppsspp
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.ppsspp.org/;
|
||||
description = "A PSP emulator, the Qt4 version";
|
||||
homepage = https://www.ppsspp.org/;
|
||||
description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fuuzetsu AndersonTorres ];
|
||||
platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
|
||||
|
||||
Reference in New Issue
Block a user