summary refs log tree commit diff
path: root/pkgs/os-specific/linux/alsa-lib
diff options
context:
space:
mode:
authorRostislav Benes <r.dee.b.b@gmail.com>2020-03-22 18:40:47 +0100
committerRostislav Benes <r.dee.b.b@gmail.com>2020-03-29 20:34:06 +0200
commit4fef426da6eae92a524ea5ca34c9a482dcf5985f (patch)
treeea9159201860e1471e398db7367f15a17842c79f /pkgs/os-specific/linux/alsa-lib
parentf0a6dfcbdf78ebc1fb30797d0ef0012a0acef837 (diff)
downloadnixpkgs-4fef426da6eae92a524ea5ca34c9a482dcf5985f.tar
nixpkgs-4fef426da6eae92a524ea5ca34c9a482dcf5985f.tar.gz
nixpkgs-4fef426da6eae92a524ea5ca34c9a482dcf5985f.tar.bz2
nixpkgs-4fef426da6eae92a524ea5ca34c9a482dcf5985f.tar.lz
nixpkgs-4fef426da6eae92a524ea5ca34c9a482dcf5985f.tar.xz
nixpkgs-4fef426da6eae92a524ea5ca34c9a482dcf5985f.tar.zst
nixpkgs-4fef426da6eae92a524ea5ca34c9a482dcf5985f.zip
alsaLib: 1.1.9 -> 1.2.2
Diffstat (limited to 'pkgs/os-specific/linux/alsa-lib')
-rw-r--r--pkgs/os-specific/linux/alsa-lib/default.nix16
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index 8dcddf4baf9..e599ba1f3f1 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.1.9";
+  name = "alsa-lib-1.2.2";
 
   src = fetchurl {
     url = "mirror://alsa/lib/${name}.tar.bz2";
-    sha256 = "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8";
+    sha256 = "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q";
   };
 
   patches = [
     ./alsa-plugin-conf-multilib.patch
   ];
 
+  enableParallelBuilding = true;
+
   # Fix pcm.h file in order to prevent some compilation bugs
-  # 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently
   postPatch = ''
     sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h
+  '';
 
-
-    sed -i -e '1i#include <stdint.h>' include/pcm.h
-    sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
+  postInstall = ''
+    ln -s ${alsa-ucm-conf}/share/alsa/{ucm,ucm2} $out/share/alsa
+    ln -s ${alsa-topology-conf}/share/alsa/topology $out/share/alsa
   '';
 
   outputs = [ "out" "dev" ];