diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-04-24 16:49:52 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-04-24 17:41:08 +0200 |
commit | 76fc67a083f3140ce5d31c8afe83496ad4d26f2f (patch) | |
tree | 0b33cd941a0e6444d4182402dc5154f8c3ad3663 | |
parent | 9ad2832b1bf6897d59d7085859b3ed8627aa1cd7 (diff) | |
download | nixlib-76fc67a083f3140ce5d31c8afe83496ad4d26f2f.tar nixlib-76fc67a083f3140ce5d31c8afe83496ad4d26f2f.tar.gz nixlib-76fc67a083f3140ce5d31c8afe83496ad4d26f2f.tar.bz2 nixlib-76fc67a083f3140ce5d31c8afe83496ad4d26f2f.tar.lz nixlib-76fc67a083f3140ce5d31c8afe83496ad4d26f2f.tar.xz nixlib-76fc67a083f3140ce5d31c8afe83496ad4d26f2f.tar.zst nixlib-76fc67a083f3140ce5d31c8afe83496ad4d26f2f.zip |
darkice: Fix build due to multiple outputs
-rw-r--r-- | pkgs/tools/audio/darkice/default.nix | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index e4fc129ef601..8ac9039b57e0 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -1,10 +1,20 @@ -{ stdenv, buildEnv, fetchurl, alsaLib, faac, libjack2, lame, libogg, libopus, libpulseaudio, libsamplerate, libvorbis }: +{ stdenv, buildEnv, fetchurl +, libjack2, alsaLib, libpulseaudio +, faac, lame, libogg, libopus, libvorbis, libsamplerate +}: let oggEnv = buildEnv { name = "env-darkice-ogg"; paths = [ - libopus libvorbis libogg + 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 ]; }; @@ -18,13 +28,13 @@ in stdenv.mkDerivation rec { }; configureFlags = [ - "--with-alsa-prefix=${alsaLib}" + "--with-alsa-prefix=${darkiceEnv}" "--with-faac-prefix=${faac}" "--with-jack-prefix=${libjack2}" - "--with-lame-prefix=${lame}" + "--with-lame-prefix=${darkiceEnv}" "--with-opus-prefix=${oggEnv}" - "--with-pulseaudio-prefix=${libpulseaudio}" - "--with-samplerate-prefix=${libsamplerate}" + "--with-pulseaudio-prefix=${darkiceEnv}" + "--with-samplerate-prefix=${darkiceEnv}" "--with-vorbis-prefix=${oggEnv}" # "--with-aacplus-prefix=${aacplus}" ### missing: aacplus # "--with-twolame-prefix=${twolame}" ### missing: twolame @@ -34,6 +44,6 @@ in stdenv.mkDerivation rec { homepage = http://darkice.org/; description = "Live audio streamer"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ ikervagyok ]; + maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ]; }; } |