From 3af491fb663c0d7c9ccb4ac085ef827573e683d2 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 13 Apr 2017 11:42:44 +0100 Subject: [PATCH 1/2] libgme: init at 0.6.1 --- .../libraries/audio/libgme/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/audio/libgme/default.nix diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix new file mode 100644 index 00000000000..23da2cd8be0 --- /dev/null +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchFromBitbucket, cmake }: +let + version = "0.6.1"; +in stdenv.mkDerivation { + name = "libgme-${version}"; + + src = fetchFromBitbucket { + owner = "mpyne"; + repo = "game-music-emu"; + rev = version; + sha256 = "04vwpv3pmjcil1jw5vcnlg45nch5awqs06y3xqdlp3ibx5i4k199"; + }; + + buildInputs = [ cmake ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14b732889ab..e5337f2a639 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9661,6 +9661,8 @@ with pkgs; inherit (haskellPackages) ghcWithPackages; }; + libgme = callPackage ../development/libraries/audio/libgme { }; + librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { }; From fe7bec1f082226cd6ac8cc9daf0c0ec401b63d29 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 13 Apr 2017 11:43:06 +0100 Subject: [PATCH 2/2] gst-plugins-bad: add libgme --- pkgs/development/libraries/audio/libgme/default.nix | 8 ++++++++ pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 23da2cd8be0..3bc048dd22f 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -4,6 +4,14 @@ let 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"; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 1125bb7bb8a..7ca2ddd0ce2 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -5,7 +5,7 @@ , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools -, mesa, libintlOrEmpty +, mesa, libintlOrEmpty, libgme }: assert faacSupport -> faac != null; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls mesa - mjpegtools + mjpegtools libgme ] ++ libintlOrEmpty ++ optional faacSupport faac