diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-10-30 06:12:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-10-30 06:12:04 +0100 |
| commit | 5c89ba8ab417f95486e2042558fdce218dadf83b (patch) | |
| tree | fae7ead1edd78a395de199814f9fb0417f201759 /pkgs/applications/audio | |
| parent | ffd13c1ba38c08c6f004d6d9a3c10d124febc3b4 (diff) | |
| parent | 4d32327bb04299bd7596cf98266e926656494b14 (diff) | |
| download | nixpkgs-5c89ba8ab417f95486e2042558fdce218dadf83b.tar nixpkgs-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.gz nixpkgs-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.bz2 nixpkgs-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.lz nixpkgs-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.xz nixpkgs-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.zst nixpkgs-5c89ba8ab417f95486e2042558fdce218dadf83b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/cmus/default.nix | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 9591cc6137d..d1540fd1cea 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.0.9"; + version = "5.0.11"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-B6s8FuNvJ3NdU7uZ+AsZkiFf9p6WcLzoZPsfzors1kk="; + sha256 = "sha256-c9bRWVWCC9hLxmko6EHgxgmghrxskJP4PQf3ld2BHoY="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index a3f859ca0ea..88d0931ca10 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config +{ config, lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null @@ -101,7 +101,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ha0bIh3SYMhA28YXQ//Loaz9J1lTJAzjTx8eK3AqUjM="; }; - patches = [ ./option-debugging.patch ]; + patches = [ + ./option-debugging.patch + # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/ + (fetchpatch { url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; }) + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] |