diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ca474d67ef..0c2dbd0723f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6335,6 +6335,12 @@ fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; }]; }; + roastiek = { + email = "r.dee.b.b@gmail.com"; + github = "roastiek"; + githubId = 422802; + name = "Rostislav Beneš"; + }; rob = { email = "rob.vermaas@gmail.com"; github = "rbvermaa"; 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 ' 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" ]; diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-topology-conf/default.nix new file mode 100644 index 00000000000..26febf0daa7 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-topology-conf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "alsa-topology-conf-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "mirror://alsa/lib/${name}.tar.bz2"; + sha256 = "09cls485ckdjsp4azhv3nw7chyg3r7zrqgald6yp70f7cysxcwml"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/alsa + cp -r topology $out/share/alsa + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = http://www.alsa-project.org/; + description = "ALSA topology configuration files"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + license = licenses.bsd3; + maintainers = [ maintainers.roastiek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix new file mode 100644 index 00000000000..6f2766ef9ff --- /dev/null +++ b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "alsa-ucm-conf-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "mirror://alsa/lib/${name}.tar.bz2"; + sha256 = "0364fgzdm2qrsqvgqri25gzscbma7yqlv31wz8b1z9c5phlxkgvy"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/alsa + cp -r ucm ucm2 $out/share/alsa + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = http://www.alsa-project.org/; + description = "ALSA Use Case Manager configuration"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + license = licenses.bsd3; + maintainers = [ maintainers.roastiek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 064ff0724d0..5bcf1a2ddf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16286,6 +16286,10 @@ in alsaOss = callPackage ../os-specific/linux/alsa-oss { }; alsaTools = callPackage ../os-specific/linux/alsa-tools { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; + + alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { }; + inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware armTrustedFirmwareTools