diff options
| author | peter woodman <peter@shortbus.org> | 2021-01-22 15:30:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 21:30:50 +0100 |
| commit | e73020d217c5fde7ea2434bd9061b3f16fd4a5d6 (patch) | |
| tree | b738c8e4b1393f6d2f16a8620572bdb85349fef4 /pkgs | |
| parent | 906ddaf3598de8b59842cd27efb5dae1e8b7bbac (diff) | |
| download | nixpkgs-e73020d217c5fde7ea2434bd9061b3f16fd4a5d6.tar nixpkgs-e73020d217c5fde7ea2434bd9061b3f16fd4a5d6.tar.gz nixpkgs-e73020d217c5fde7ea2434bd9061b3f16fd4a5d6.tar.bz2 nixpkgs-e73020d217c5fde7ea2434bd9061b3f16fd4a5d6.tar.lz nixpkgs-e73020d217c5fde7ea2434bd9061b3f16fd4a5d6.tar.xz nixpkgs-e73020d217c5fde7ea2434bd9061b3f16fd4a5d6.tar.zst nixpkgs-e73020d217c5fde7ea2434bd9061b3f16fd4a5d6.zip | |
alsaLib: fix build under musl-libc (#110413)
* alsaLib: fix build under musl-libc there's a commit in upstream master that fixes the build issue here. this patch is also applied in alpine linux. * alsaLib: explainer for DL_ORIGIN patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-lib/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index cea26646672..2511c88f3f1 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: +{ lib, stdenv, fetchurl, fetchpatch, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { pname = "alsa-lib"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { patches = [ ./alsa-plugin-conf-multilib.patch + (fetchpatch { + # plucked from upstream master, delete in next release + # without this patch alsa 1.2.4 fails to compile against musl-libc + # due to an overly conservative ifdef gate in a new feature + name = "fix-dlo.patch"; + url = "https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch"; + sha256 = "QQP4C1dSnJP1MNKt2el7Wn3KmtwtYzvyIHWdrHs+Jw4="; + }) ]; enableParallelBuilding = true; |