From c4f54821ebf897ce44e0ae5f9312db90c6b4bd61 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 12 Sep 2016 10:30:43 +0200
Subject: darkice: fix and simplify dependencies

---
 pkgs/tools/audio/darkice/default.nix | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'pkgs/tools/audio/darkice')

diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index d9e1d196915f..bb2df52f84c5 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -1,24 +1,9 @@
-{ stdenv, buildEnv, fetchurl
+{ stdenv, buildEnv, fetchurl, pkgconfig
 , libjack2, alsaLib, libpulseaudio
 , faac, lame, libogg, libopus, libvorbis, libsamplerate
 }:
 
-let
-  oggEnv = buildEnv {
-    name = "env-darkice-ogg";
-    paths = [
-      libopus.dev libopus libvorbis.dev libvorbis libogg.dev libogg
-    ];
-  };
-
-  darkiceEnv = buildEnv {
-    name = "env-darkice";
-    paths = [
-      lame.out lame.lib libpulseaudio libpulseaudio.dev alsaLib alsaLib.dev libsamplerate.out libsamplerate.dev
-    ];
-  };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "darkice-${version}";
   version = "1.3";
 
@@ -27,17 +12,16 @@ in stdenv.mkDerivation rec {
     sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame
+  ];
+
+  NIX_CFLAGS_COMPILE = "-fpermissive";
+
   configureFlags = [
-    "--with-alsa-prefix=${darkiceEnv}"
     "--with-faac-prefix=${faac}"
-    "--with-jack-prefix=${libjack2}"
-    "--with-lame-prefix=${darkiceEnv}"
-    "--with-opus-prefix=${oggEnv}"
-    "--with-pulseaudio-prefix=${darkiceEnv}"
-    "--with-samplerate-prefix=${darkiceEnv}"
-    "--with-vorbis-prefix=${oggEnv}"
-#    "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
-#    "--with-twolame-prefix=${twolame}" ### missing: twolame
+    "--with-lame-prefix=${lame.lib}"
   ];
 
   patches = [ ./fix-undeclared-memmove.patch ];
-- 
cgit 1.4.1