From d364e682b07447c81bc07a2c5b77cf815abc4738 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:23 +0000 Subject: [PATCH] pcaudiolib: move defaults to package file --- pkgs/development/libraries/pcaudiolib/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index efaf2cfd429..2050e5cdfe7 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig, - alsaLib, portaudio, - pulseaudioSupport ? true, libpulseaudio }: +{ config, stdenv, lib, fetchFromGitHub +, autoconf, automake, which, libtool, pkgconfig +, portaudio, alsaLib +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { name = "pcaudiolib-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e01aeb721f8..6a2e5ff86d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11890,9 +11890,7 @@ in pangoxsl = callPackage ../development/libraries/pangoxsl { }; - pcaudiolib = callPackage ../development/libraries/pcaudiolib { - pulseaudioSupport = config.pulseaudio or true; - }; + pcaudiolib = callPackage ../development/libraries/pcaudiolib { }; pcg_c = callPackage ../development/libraries/pcg-c { };