JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alsa-ucm-conf: drop conflicting upstream patch

Browse Source 
Without the change the build fails on `staging` as:

    alsa-ucm-conf> Running phase: patchPhase
    alsa-ucm-conf> applying patch /nix/store/m1yxcbpkxrqjp7kml9ij2x4i1y5zc0m2-alsa-ucm-conf-splitpcm-device-argument-fix.patch
    alsa-ucm-conf> patching file ucm2/common/pcm/split.conf
    alsa-ucm-conf> Reversed (or previously applied) patch detected!  Assume -R? [n]
    alsa-ucm-conf> Apply anyway? [n]
    alsa-ucm-conf> Skipping patch.
    alsa-ucm-conf> 1 out of 1 hunk ignored -- saving rejects to file ucm2/common/pcm/split.conf.rej
This commit is contained in:
Sergei Trofimovich 2024-02-16 21:43:57 +00:00
parent 6d90f72388
commit 0e64c89ef1
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/by-name/al/alsa-ucm-conf/package.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "alsa-ucm-conf";
@ -9,16 +9,6 @@ stdenv.mkDerivation rec {
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;
installPhase = ''