Merge remote-tracking branch 'central/master' into stdenv-updates

Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
parent 0214514f8b bff4b06640
commit 3b26ba7019
38 changed files with 283 additions and 74 deletions
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, alsaLib, gettext, ncurses}:
+{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:

 stdenv.mkDerivation rec {
  name = "alsa-utils-1.0.26";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq";
  };

-  buildInputs = [ alsaLib ncurses ];
+  buildInputs = [ alsaLib ncurses libsamplerate ];
  nativeBuildInputs = [ gettext ];

  configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";