overrides: Move pvolctrl into a subdirectory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 36 insertions, 33 deletions

diff --git a/overrides/default.nix b/overrides/default.nix
index 170c8d39..4e970796 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -110,39 +110,7 @@ let
       '';
     };
 
-    pvolctrl = stdenv.mkDerivation rec {
-      name = "pvolctrl-0.23";
-
-      unpackPhase = let
-        baseurl = "https://sites.google.com/site/guenterbartsch/blog/"
-                + "volumecontrolutilityforpulseaudio/";
-        makefile = fetchurl {
-          url = baseurl + "Makefile";
-          sha256 = "0l2ffvb617csk6h29y64v6ywhpcp7la6vvcip1w4nq0yry6jhrqz";
-        };
-        source = fetchurl {
-          url = baseurl + "pvolctrl.c";
-          sha256 = "0vcd5dlw9l47jpabwmmzdvlkn67fz55dr3sryyh56sl263mibjda";
-        };
-      in ''
-        mkdir -p "${name}"
-        sed -e 's|/usr/bin/||' "${makefile}" > "${name}/Makefile"
-        sed -e 's/PA_VOLUME_MAX/PA_VOLUME_NORM/
-        /avg_vol += (avg_vol \* vol_mod) \/ 100;/ {
-          s/(avg_vol/((int)PA_VOLUME_NORM/
-        }
-        /if (vol_mod)/i \
-          if (info->name == NULL || strncmp(info->name, "combined", 8) != 0) \
-            return;' "${source}" > "${name}/pvolctrl.c"
-        sourceRoot="${name}"
-      '';
-
-      installPhase = ''
-        install -D -T pvolctrl "$out/bin/pvolctrl"
-      '';
-
-      buildInputs = [ pkgconfig pulseaudio ];
-    };
+    pvolctrl = callPackage ./pvolctrl { };
 
     librxtx_java = callPackage ./librxtx-java { };
 
diff --git a/overrides/pvolctrl/default.nix b/overrides/pvolctrl/default.nix
new file mode 100644
index 00000000..25edb27f
--- /dev/null
+++ b/overrides/pvolctrl/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, pulseaudio }:
+
+stdenv.mkDerivation rec {
+  name = "pvolctrl-0.23";
+
+  unpackPhase = let
+    baseurl = "https://sites.google.com/site/guenterbartsch/blog/"
+            + "volumecontrolutilityforpulseaudio/";
+    makefile = fetchurl {
+      url = baseurl + "Makefile";
+      sha256 = "0l2ffvb617csk6h29y64v6ywhpcp7la6vvcip1w4nq0yry6jhrqz";
+    };
+    source = fetchurl {
+      url = baseurl + "pvolctrl.c";
+      sha256 = "0vcd5dlw9l47jpabwmmzdvlkn67fz55dr3sryyh56sl263mibjda";
+    };
+  in ''
+    mkdir -p "${name}"
+    sed -e 's|/usr/bin/||' "${makefile}" > "${name}/Makefile"
+    sed -e 's/PA_VOLUME_MAX/PA_VOLUME_NORM/
+    /avg_vol += (avg_vol \* vol_mod) \/ 100;/ {
+      s/(avg_vol/((int)PA_VOLUME_NORM/
+    }
+    /if (vol_mod)/i \
+      if (info->name == NULL || strncmp(info->name, "combined", 8) != 0) \
+        return;' "${source}" > "${name}/pvolctrl.c"
+    sourceRoot="${name}"
+  '';
+
+  installPhase = ''
+    install -D -T pvolctrl "$out/bin/pvolctrl"
+  '';
+
+  buildInputs = [ pkgconfig pulseaudio ];
+}