Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 906ddaf3598d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e73020d217c5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 22, 2021

  1. 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
    @pjjw
    pjjw authored Jan 22, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e73020d View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/os-specific/linux/alsa-lib/default.nix
10 changes: 9 additions & 1 deletion pkgs/os-specific/linux/alsa-lib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;