Merge pull request #10557 from mayflower/fix/darkice-ogg

darkice: Fix build with opus and vorbis support

1 files changed, 11 insertions, 5 deletions

diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index edc8fe2dffc8..e4fc129ef601 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -1,8 +1,14 @@
-{ stdenv, fetchurl, alsaLib, faac, libjack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
+{ stdenv, buildEnv, fetchurl, alsaLib, faac, libjack2, lame, libogg, libopus, libpulseaudio, libsamplerate, libvorbis }:
 
-with stdenv.lib;
+let
+  oggEnv = buildEnv {
+    name = "env-darkice-ogg";
+    paths = [
+      libopus libvorbis libogg
+    ];
+  };
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   name = "darkice-${version}";
   version = "1.2";
 
@@ -16,10 +22,10 @@ stdenv.mkDerivation rec {
     "--with-faac-prefix=${faac}"
     "--with-jack-prefix=${libjack2}"
     "--with-lame-prefix=${lame}"
-    "--with-opus-prefix=${libopus}"
+    "--with-opus-prefix=${oggEnv}"
     "--with-pulseaudio-prefix=${libpulseaudio}"
     "--with-samplerate-prefix=${libsamplerate}"	
-    "--with-vorbis-prefix=${libvorbis}"
+    "--with-vorbis-prefix=${oggEnv}"
 #    "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
 #    "--with-twolame-prefix=${twolame}" ### missing: twolame
   ];