From f2ff98520ed6fd600ca1e2392a48e1b70702fb31 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:33:31 +0000 Subject: [PATCH] openmpt123: move defaults to package file --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index af859702292..f8f08369ab9 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac -, usePulseAudio ? false, libpulseaudio }: +{ config, stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +, usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let version = "0.4.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 585a3f7e75e..ec447d85f3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18677,9 +18677,7 @@ in vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; - openmpt123 = callPackage ../applications/audio/openmpt123 { - usePulseAudio = config.pulseaudio or false; - }; + openmpt123 = callPackage ../applications/audio/openmpt123 { }; opusfile = callPackage ../applications/audio/opusfile { };