diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-27 11:32:12 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-27 11:32:12 +0100 |
| commit | 3b26ba70197f8a420e85def67582aab7799427d8 (patch) | |
| tree | e24b777cff4da6b7046ab18b335fc94cc9d22dce /pkgs/os-specific/linux/alsa-utils | |
| parent | 0214514f8b20806236969e3ca0125eafe5836a41 (diff) | |
| parent | bff4b066401e7b61d37a4a038f7c9722f796d860 (diff) | |
| download | nixpkgs-3b26ba70197f8a420e85def67582aab7799427d8.tar nixpkgs-3b26ba70197f8a420e85def67582aab7799427d8.tar.gz nixpkgs-3b26ba70197f8a420e85def67582aab7799427d8.tar.bz2 nixpkgs-3b26ba70197f8a420e85def67582aab7799427d8.tar.lz nixpkgs-3b26ba70197f8a420e85def67582aab7799427d8.tar.xz nixpkgs-3b26ba70197f8a420e85def67582aab7799427d8.tar.zst nixpkgs-3b26ba70197f8a420e85def67582aab7799427d8.zip | |
Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix
Diffstat (limited to 'pkgs/os-specific/linux/alsa-utils')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 08df6fe64c2..c121b227eee 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -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"; |