diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-06-16 19:58:58 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-06-16 19:59:05 +0200 |
commit | e3dfa794412778ab993054a8e0a55a7a5490c022 (patch) | |
tree | afcfb540333a669269b36adcfcf6def5e7e688ec /pkgs/applications/audio | |
parent | 30915f8d471cba27ec9364135cdcb27f83b52f5d (diff) | |
parent | b08ae54dd9daf4cceb03d49d681bfbd7ad013bb8 (diff) | |
download | nixpkgs-e3dfa794412778ab993054a8e0a55a7a5490c022.tar nixpkgs-e3dfa794412778ab993054a8e0a55a7a5490c022.tar.gz nixpkgs-e3dfa794412778ab993054a8e0a55a7a5490c022.tar.bz2 nixpkgs-e3dfa794412778ab993054a8e0a55a7a5490c022.tar.lz nixpkgs-e3dfa794412778ab993054a8e0a55a7a5490c022.tar.xz nixpkgs-e3dfa794412778ab993054a8e0a55a7a5490c022.tar.zst nixpkgs-e3dfa794412778ab993054a8e0a55a7a5490c022.zip |
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/bchoppr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/gbsplay/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/audio/reaper/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/audio/songrec/default.nix | 4 |
4 files changed, 28 insertions, 19 deletions
diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 91d5d3c216d..ec09e62b094 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.10.6"; + version = "1.10.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-iCDAIV2p1OkZxOMo8A6zBrOGd49FXAGqLZWk0Kbvgec="; + sha256 = "sha256-F2J9TBONluhBuoEnpff3tLZEHFDbmllILqbZvu+PGGI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 7cee125f6e7..3d280ca72ab 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -1,28 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }: -stdenv.mkDerivation { - name = "gbsplay-2016-12-17"; +stdenv.mkDerivation rec { + pname = "gbsplay"; + version = "0.0.94"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; - rev = "2c4486e17fd4f4cdea8c3fd79ae898c892616b70"; - sha256 = "1214j67sr87zfhvym41cw2g823fmqh4hr451r7y1s9ql3jpjqhpz"; + rev = version; + sha256 = "VpaXbjotmc/Ref1geiKkBX9UhbPxfAGkFAdKVxP8Uxo="; }; - buildInputs = [ libpulseaudio ]; + configureFlags = [ + "--without-test" # See mmitch/gbsplay#62 + "--without-contrib" + ]; - configureFlags = - [ "--without-test" "--without-contrib" "--disable-devdsp" - "--enable-pulse" "--disable-alsa" "--disable-midi" - "--disable-nas" "--disable-dsound" "--disable-i18n" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libpulseaudio nas ]; - makeFlags = [ "tests=" ]; + postInstall = '' + installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion + ''; meta = with lib; { - description = "gameboy sound player"; + description = "Gameboy sound player"; license = licenses.gpl1; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ dasuxullebt ]; }; } diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 705685811ff..773560c83ca 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.28"; + version = "6.29"; src = fetchurl { - url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4="; + url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.targetPlatform.qemuArch}.tar.xz"; + hash = if stdenv.isx86_64 then "sha256-DOul6J2Y7szy4+Q4SeO0uG6PSuU+MELE7ky8W3mSpTQ=" + else "sha256-67iTi6bFlbQtyCjnPIjK8K/3aV+zaCsWBRCWmgYonM4="; }; nativeBuildInputs = [ @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; license = licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ jfrankenau ilian ]; }; } diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 2928771b3ec..ccedb4c069e 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -25,6 +25,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; + postInstall = '' + mv packaging/rootfs/usr/share $out/share + ''; + meta = with lib; { description = "An open-source Shazam client for Linux, written in Rust"; homepage = "https://github.com/marin-m/SongRec"; |