diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
| commit | 16f676d6bbd4f930b0017ccb20cebe5a29e17545 (patch) | |
| tree | 0d554b4f16bdef502035b743457fc29ffcc5e7f7 /nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix | |
| parent | e7caacc4c122b7641bb66a4c2595289347a4996c (diff) | |
| parent | 3a8d7958a610cd3fec3a6f424480f91a1b259185 (diff) | |
| download | nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.gz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.bz2 nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.lz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.xz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.zst nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.zip | |
Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 2511c88f3f1b..7d2615824a68 100644 --- a/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -1,24 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, alsa-ucm-conf, alsa-topology-conf }: +{ lib +, stdenv +, fetchurl +, alsa-topology-conf +, alsa-ucm-conf +}: stdenv.mkDerivation rec { pname = "alsa-lib"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-91VL4aVs3/RotY/BwpuVtkhkxZADjdMJx6l4xxFpCPc="; + sha256 = "067ga0l6zr782kw8jdsqvbb20pcgnl0vkpnnz2n36fq8ii58k4lh"; }; 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; |