Merge pull request #24872 from lheckemann/libgme

Add libgme
This commit is contained in:
Michael Raskin 2017-05-01 12:00:30 +02:00 committed by GitHub
commit 3a548b8fef
3 changed files with 27 additions and 2 deletions

View File

@ -0,0 +1,23 @@
{ stdenv, fetchFromBitbucket, cmake }:
let
version = "0.6.1";
in stdenv.mkDerivation {
name = "libgme-${version}";
meta = with stdenv.lib; {
description = "A collection of video game music chip emulators";
homepage = "https://bitbucket.org/mpyne/game-music-emu/overview";
license = licenses.lgpl21;
platforms = platforms.all;
maintainers = with maintainers; [ lheckemann ];
};
src = fetchFromBitbucket {
owner = "mpyne";
repo = "game-music-emu";
rev = version;
sha256 = "04vwpv3pmjcil1jw5vcnlg45nch5awqs06y3xqdlp3ibx5i4k199";
};
buildInputs = [ cmake ];
}

View File

@ -5,7 +5,7 @@
, openjpeg, libopus, librsvg , openjpeg, libopus, librsvg
, wildmidi, fluidsynth, libvdpau, wayland , wildmidi, fluidsynth, libvdpau, wayland
, libwebp, xvidcore, gnutls, mjpegtools , libwebp, xvidcore, gnutls, mjpegtools
, mesa, libintlOrEmpty , mesa, libintlOrEmpty, libgme
}: }:
assert faacSupport -> faac != null; assert faacSupport -> faac != null;
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
openjpeg libopus librsvg openjpeg libopus librsvg
fluidsynth libvdpau fluidsynth libvdpau
libwebp xvidcore gnutls mesa libwebp xvidcore gnutls mesa
mjpegtools mjpegtools libgme
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ optional faacSupport faac ++ optional faacSupport faac

View File

@ -9749,6 +9749,8 @@ with pkgs;
inherit (haskellPackages) ghcWithPackages; inherit (haskellPackages) ghcWithPackages;
}; };
libgme = callPackage ../development/libraries/audio/libgme { };
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { }; librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };