diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-12 17:58:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 17:58:41 -0400 |
| commit | 1fc591f9a5bd1b016b5d66dfab29560073955a14 (patch) | |
| tree | c364792bb31046e6fead699e29b48de1fbf9ad48 /pkgs/os-specific/linux | |
| parent | 171eb304c6cfa201ed8345de81cbcd82fdf398fa (diff) | |
| parent | 605f67eab45288ca1b8639ab0d21374cd9654674 (diff) | |
| download | nixlib-1fc591f9a5bd1b016b5d66dfab29560073955a14.tar nixlib-1fc591f9a5bd1b016b5d66dfab29560073955a14.tar.gz nixlib-1fc591f9a5bd1b016b5d66dfab29560073955a14.tar.bz2 nixlib-1fc591f9a5bd1b016b5d66dfab29560073955a14.tar.lz nixlib-1fc591f9a5bd1b016b5d66dfab29560073955a14.tar.xz nixlib-1fc591f9a5bd1b016b5d66dfab29560073955a14.tar.zst nixlib-1fc591f9a5bd1b016b5d66dfab29560073955a14.zip | |
Merge pull request #57918 from bobvanderlinden/alsa-oss-tools-1.1.8
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-oss/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/alsa-plugins/default.nix | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 8fd93f588344..d3e7dd5fa5da 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-oss-1.1.8"; + pname = "alsa-oss"; + version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/oss-lib/${name}.tar.bz2"; + url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2"; sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 9012f32f31df..90319efd7c78 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-1.1.6"; + pname = "alsa-plugins"; + version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/plugins/${name}.tar.bz2"; - sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg"; + url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; + sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz"; }; # ToDo: a52, etc.? @@ -14,6 +15,10 @@ stdenv.mkDerivation rec { ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; + configureFlags = [ + "--with-alsalconfdir=${placeholder "out"}/etc/alsa/conf.d" + ]; + meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; |