* Updated ALSA.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18055
This commit is contained in:
parent
65c0916cb7
commit
97ea4b3375
|
@ -1,17 +1,20 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "alsa-lib-1.0.19";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "alsa-lib-1.0.21a";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2;
|
||||
sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij";
|
||||
};
|
||||
url = "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2";
|
||||
sha256 = "0x00sxvf1271vfg829yabaj0xkm4xgvk5vvwcq4qnhn5mnphkkm6";
|
||||
};
|
||||
|
||||
configureFlags = "--disable-xmlto";
|
||||
|
||||
# Fix pcm.h file in order to prevent some compilation bugs
|
||||
patchPhase = ''
|
||||
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
|
||||
unset patchPhase; patchPhase
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "ALSA, the Advanced Linux Sound Architecture libraries";
|
||||
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
{stdenv, fetchurl, alsaLib, gettext, ncurses}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "alsa-utils-1.0.19";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "alsa-utils-1.0.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.19.tar.bz2;
|
||||
sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z";
|
||||
url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2";
|
||||
sha256 = "19jpqfrlc13yxvw3vzdw6cgdwjd97spsmn348v5181wkid8lkwvd";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib gettext ncurses ];
|
||||
|
||||
configureFlags = "--disable-xmlto";
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -234,7 +234,6 @@ in {
|
|||
libtool_2 = all;
|
||||
libtopology = all;
|
||||
libxml2 = all;
|
||||
libxml2New = all;
|
||||
libxslt = all;
|
||||
linuxwacom = linux;
|
||||
lout = linux;
|
||||
|
|
Loading…
Reference in a new issue