Merge pull request #289388 from trofi/alsa-ucm-conf-patch-drop

alsa-ucm-conf: drop conflicting upstream patch
This commit is contained in:
Adam C. Stephens 2024-02-17 00:27:31 -05:00 committed by GitHub
commit 872e575406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "alsa-ucm-conf"; pname = "alsa-ucm-conf";
@ -9,16 +9,6 @@ stdenv.mkDerivation rec {
hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE="; hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE=";
}; };
patches = [
(fetchpatch {
# ToDo: Remove this patch in the next package upgrade
# Fixes SplitPCM to make some audio devices work with alsa-ucm-conf v1.2.10 again
name = "alsa-ucm-conf-splitpcm-device-argument-fix.patch";
url = "https://github.com/alsa-project/alsa-ucm-conf/commit/b68aa52acdd2763fedad5eec0f435fbf43e5ccc6.patch";
hash = "sha256-8WE4+uhi4W7cCSZYmL7uFpcHJ9muX09UkGXyZIpEd9I=";
})
];
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''