From c5c0c8f9fad73451edcfcab17b3efc87b0a6e0df Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 19 Mar 2019 22:05:32 +0100
Subject: [PATCH 1/4] alsa-plugins: 1.1.6 -> 1.1.8

---
 pkgs/os-specific/linux/alsa-plugins/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 9012f32f31df..47c338de8c02 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";
+  name = "alsa-plugins-${version}";
+  version = "1.1.8";
 
   src = fetchurl {
     url = "mirror://alsa/plugins/${name}.tar.bz2";
-    sha256 = "04qcwkisbh0d6lnh0rw1k6n869fbs6zbfq6yvb41rymiwgmk27bg";
+    sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz";
   };
 
   # ToDo: a52, etc.?

From fae2dc74a68b98674a9441b972c7c5991ecdf4b8 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 11 Apr 2019 22:03:07 +0200
Subject: [PATCH 2/4] alsa-oss: split version from name

---
 pkgs/os-specific/linux/alsa-oss/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix
index 8fd93f588344..3ca783e5686e 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/pkgs/os-specific/linux/alsa-oss/default.nix
@@ -1,7 +1,8 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-oss-1.1.8";
+  name = "alsa-oss-${version}";
+  version = "1.1.8";
 
   src = fetchurl {
     url = "mirror://alsa/oss-lib/${name}.tar.bz2";

From 8f6aa781e8b4a0414092a8795a410fcffe2152cf Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 11 Apr 2019 22:46:35 +0200
Subject: [PATCH 3/4] alsa-{oss,plugins}: use pname

---
 pkgs/os-specific/linux/alsa-oss/default.nix     | 4 ++--
 pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix
index 3ca783e5686e..d3e7dd5fa5da 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/pkgs/os-specific/linux/alsa-oss/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-oss-${version}";
+  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 47c338de8c02..6768dac33261 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-plugins-${version}";
+  pname = "alsa-plugins";
   version = "1.1.8";
 
   src = fetchurl {
-    url = "mirror://alsa/plugins/${name}.tar.bz2";
+    url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2";
     sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz";
   };
 

From 605f67eab45288ca1b8639ab0d21374cd9654674 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 11 Apr 2019 23:07:42 +0200
Subject: [PATCH 4/4] alsa-plugins: use $out/etc/alsa/conf.d for alsalconfdir

---
 pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 6768dac33261..90319efd7c78 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -15,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/;