diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
commit | ed2b1b4b909538716abb6378971ba75fae65b7d2 (patch) | |
tree | 25c9f8f505f3ad7d3955c556a50ef6c111e7c369 /pkgs/applications/audio/vgmstream/default.nix | |
parent | f68dbdc7c39faa5f685e34b10da0b373ad6a7c22 (diff) | |
parent | 2970b27faf15840714feba50186e7e02d945569f (diff) | |
download | nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.gz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.bz2 nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.lz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.xz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.zst nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/audio/vgmstream/default.nix')
-rw-r--r-- | pkgs/applications/audio/vgmstream/default.nix | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index a3518f23984..f696c506186 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -1,26 +1,35 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, mpg123, ffmpeg, libvorbis, libao, jansson +, mpg123, ffmpeg, libvorbis, libao, jansson, speex }: +let + vgmstreamVersion = "r1702-5596-00bdb165b"; +in stdenv.mkDerivation rec { - pname = "vgmstream"; - version = "r1050-3448-g77cc431b"; + pname = "vgmstream"; + version = "unstable-2022-02-21"; src = fetchFromGitHub { - owner = "vgmstream"; - repo = "vgmstream"; - rev = version; - sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d"; + owner = "vgmstream"; + repo = "vgmstream"; + rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0"; + sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; }; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ]; + buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; - # There's no nice way to build the audacious plugin without a circular dependency - cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ]; + cmakeFlags = [ + # There's no nice way to build the audacious plugin without a circular dependency + "-DBUILD_AUDACIOUS=OFF" + # It always tries to download it, no option to use the system one + "-DUSE_CELT=OFF" + ]; - preConfigure = '' - echo "#define VERSION \"${version}\"" > cli/version.h + postConfigure = '' + echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h ''; meta = with lib; { |