diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-30 15:05:13 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-30 15:05:13 +0000 |
| commit | 97ea4b33756f50aaf470fc08ccf8de67569a475d (patch) | |
| tree | ce80b9b3597b0703ac74f5c3bea9b0bcd839a837 /pkgs/os-specific | |
| parent | 65c0916cb707ec12674884207f31d8dd792b2158 (diff) | |
| download | nixpkgs-97ea4b33756f50aaf470fc08ccf8de67569a475d.tar nixpkgs-97ea4b33756f50aaf470fc08ccf8de67569a475d.tar.gz nixpkgs-97ea4b33756f50aaf470fc08ccf8de67569a475d.tar.bz2 nixpkgs-97ea4b33756f50aaf470fc08ccf8de67569a475d.tar.lz nixpkgs-97ea4b33756f50aaf470fc08ccf8de67569a475d.tar.xz nixpkgs-97ea4b33756f50aaf470fc08ccf8de67569a475d.tar.zst nixpkgs-97ea4b33756f50aaf470fc08ccf8de67569a475d.zip | |
* Updated ALSA.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18055
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-lib/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 11 |
2 files changed, 17 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index ad9f5551afe..daabf99d543 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index cca6a75ce0a..8eda24de577 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -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 = { |