git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #57918 from bobvanderlinden/alsa-oss-tools-1.1.8
commit1fc591f9a5bd1b016b5d66dfab29560073955a14 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateFri 12 Apr 2019, 17:58 (8 years ago) parent171eb30605f67e
2 files changed+11−5
pkgs/os-specific/linux/alsa-oss/default.nix+3−2 pkgs/os-specific/linux/alsa-plugins/default.nix+8−3
pkgs/os-specific/linux/alsa-oss/default.nix+3−2
@@ -1,10 +1,11 @@
11{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
22
33stdenv.mkDerivation rec {
4− name = "alsa-oss-1.1.8";
4+ pname = "alsa-oss";
5+ version = "1.1.8";
56
67 src = fetchurl {
7− url = "mirror://alsa/oss-lib/${name}.tar.bz2";
8+ url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2";
89 sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4";
910 };
1011
pkgs/os-specific/linux/alsa-plugins/default.nix+8−3
@@ -1,11 +1,12 @@
11{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
22
33stdenv.mkDerivation rec {
4− name = "alsa-plugins-1.1.6";
4+ pname = "alsa-plugins";
5+ version = "1.1.8";
56
67 src = fetchurl {
7− url = "mirror://alsa/plugins/${name}.tar.bz2";
8− sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg";
8+ url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2";
9+ sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz";
910 };
1011
1112 # ToDo: a52, etc.?
@@ -14,6 +15,10 @@ stdenv.mkDerivation rec {
1415 ++ lib.optional (libpulseaudio != null) libpulseaudio
1516 ++ lib.optional (libjack2 != null) libjack2;
1617
18+ configureFlags = [
19+ "--with-alsalconfdir=${placeholder "out"}/etc/alsa/conf.d"
20+ ];
21+
1722 meta = with lib; {
1823 description = "Various plugins for ALSA";
1924 homepage = http://alsa-project.org/;