From f2b9162167f471914c90159a1171e8c79f122fd8 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 12 Jan 2019 10:52:37 +0300 Subject: [PATCH] openmpt123: 0.2.7025-beta20.1 -> 0.4.1 --- .../applications/audio/openmpt123/default.nix | 26 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 5d13aa7daf4..af859702292 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }: +{ stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +, usePulseAudio ? false, libpulseaudio }: let - version = "0.2.7025-beta20.1"; + version = "0.4.1"; in stdenv.mkDerivation rec { name = "openmpt123-${version}"; + src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; - sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; + sha256 = "1k1m1adjh4s2q9lxgkf836k5243akxrzq1hsdjhrkg4idd3pxzp4"; }; + + enableParallelBuilding = true; + doCheck = true; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL2 flac libsndfile ]; - makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] - ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; - installFlags = "PREFIX=\${out}"; + buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] + ++ stdenv.lib.optional usePulseAudio libpulseaudio; + + configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ]; meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; homepage = https://lib.openmpt.org/libopenmpt/; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2933ea5a8e9..3a0039a3dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18680,7 +18680,9 @@ in vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; - openmpt123 = callPackage ../applications/audio/openmpt123 {}; + openmpt123 = callPackage ../applications/audio/openmpt123 { + usePulseAudio = config.pulseaudio or false; + }; opusfile = callPackage ../applications/audio/opusfile { };