public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55732 from oxij/tree/move-defaults-to-package-files-mostly-pulse

Browse Source 
all-packages.nix: move defaults to package files continues
This commit is contained in:
Samuel Dionne-Riel 2019-02-15 17:49:01 -05:00 committed by GitHub
commit f8eef26991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 44 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/cmus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig { config, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig
, libiconv, CoreAudio , libiconv, CoreAudio
, alsaSupport ? stdenv.isLinux, alsaLib ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null
@ -7,7 +7,7 @@
, jackSupport ? false, libjack ? null , jackSupport ? false, libjack ? null
, samplerateSupport ? jackSupport, libsamplerate ? null , samplerateSupport ? jackSupport, libsamplerate ? null
, ossSupport ? false, alsaOss ? null , ossSupport ? false, alsaOss ? null
, pulseaudioSupport ? false, libpulseaudio ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null
# TODO: add these # TODO: add these
#, artsSupport #, artsSupport

4
pkgs/applications/audio/deadbeef/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, jansson { config, stdenv, fetchurl, intltool, pkgconfig, jansson
# deadbeef can use either gtk2 or gtk3 # deadbeef can use either gtk2 or gtk3
, gtk2Support ? false, gtk2 ? null , gtk2Support ? false, gtk2 ? null
, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
@ -20,7 +20,7 @@
, osdSupport ? true, dbus ? null , osdSupport ? true, dbus ? null
# output plugins # output plugins
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, pulseSupport ? true, libpulseaudio ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
# effect plugins # effect plugins
, resamplerSupport ? true, libsamplerate ? null , resamplerSupport ? true, libsamplerate ? null
, overloadSupport ? true, zlib ? null , overloadSupport ? true, zlib ? null

13
pkgs/applications/audio/mimic/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig { config, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig
, alsaLib, libtool, icu , alsaLib, libtool, icu
, pulseaudioSupport ? true, libpulseaudio }: , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mimic-${version}"; name = "mimic-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j"; sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkgconfig pkgconfig
]; ];
@ -21,15 +21,14 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib alsaLib
libtool libtool
icu icu
] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio;
meta = { meta = {
description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)";
homepage = https://mimic.mycroft.ai/; homepage = https://mimic.mycroft.ai/;
license = stdenv.lib.licenses.free; license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.noneucat ]; maintainers = [ stdenv.lib.maintainers.noneucat ];
}; };
} }

12
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,4 +1,5 @@
{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed { newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7
, makeWrapper, makeDesktopItem, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas , glib, gtk3, gnome3, gsettings-desktop-schemas
# package customization # package customization
@ -10,12 +11,17 @@
, enablePepperFlash ? false , enablePepperFlash ? false
, enableWideVine ? false , enableWideVine ? false
, cupsSupport ? true , cupsSupport ? true
, pulseSupport ? false , pulseSupport ? config.pulseaudio or stdenv.isLinux
, commandLineArgs ? "" , commandLineArgs ? ""
}: }:
assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv);
let let
stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_7.stdenv;
llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_7;
in let
stdenv = stdenv_;
llvmPackages = llvmPackages_;
callPackage = newScope chromium; callPackage = newScope chromium;
chromium = { chromium = {

6
pkgs/applications/video/aegisub/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl { config, stdenv, fetchurl
, libX11, wxGTK , libX11, wxGTK
, libiconv, fontconfig, freetype , libiconv, fontconfig, freetype
, libGLU_combined , libGLU_combined
@ -8,8 +8,8 @@
, spellcheckSupport ? true, hunspell ? null , spellcheckSupport ? true, hunspell ? null
, automationSupport ? true, lua ? null , automationSupport ? true, lua ? null
, openalSupport ? false, openal ? null , openalSupport ? false, openal ? null
, alsaSupport ? true, alsaLib ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null
, pulseaudioSupport ? true, libpulseaudio ? null , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, portaudioSupport ? false, portaudio ? null }: , portaudioSupport ? false, portaudio ? null }:
assert spellcheckSupport -> (hunspell != null); assert spellcheckSupport -> (hunspell != null);

5
pkgs/applications/video/bomi/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which { config, stdenv, fetchFromGitHub
, fetchpatch, pkgconfig, perl, python, which
, libX11, libxcb, libGLU_combined , libX11, libxcb, libGLU_combined
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
, libchardet , libchardet
@ -15,7 +16,7 @@
, libbluray , libbluray
, jackSupport ? false, jack ? null , jackSupport ? false, jack ? null
, portaudioSupport ? false, portaudio ? null , portaudioSupport ? false, portaudio ? null
, pulseSupport ? true, libpulseaudio ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, cddaSupport ? false, libcdda ? null , cddaSupport ? false, libcdda ? null
, youtubeSupport ? true, youtube-dl ? null , youtubeSupport ? true, youtube-dl ? null
}: }:

4
pkgs/applications/video/mplayer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg { config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg
, aalibSupport ? true, aalib ? null , aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null , fribidiSupport ? true, fribidi ? null
@ -19,7 +19,7 @@
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
, x264Support ? false, x264 ? null , x264Support ? false, x264 ? null
, jackaudioSupport ? false, libjack2 ? null , jackaudioSupport ? false, libjack2 ? null
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
, bs2bSupport ? false, libbs2b ? null , bs2bSupport ? false, libbs2b ? null
# For screenshots # For screenshots
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null

4
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2 { config, stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap , libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
, libpng, glib, lvm2, libXrandr, libXinerama, libopus , libpng, glib, lvm2, libXrandr, libXinerama, libopus
, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
@ -7,7 +7,7 @@
, javaBindings ? false, jdk ? null , javaBindings ? false, jdk ? null
, pythonBindings ? false, python2 ? null , pythonBindings ? false, python2 ? null
, extensionPack ? null, fakeroot ? null , extensionPack ? null, fakeroot ? null
, pulseSupport ? false, libpulseaudio ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, enableHardening ? false , enableHardening ? false
, headless ? false , headless ? false
, enable32bitGuests ? true , enable32bitGuests ? true

7
pkgs/development/libraries/pcaudiolib/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig, { config, stdenv, lib, fetchFromGitHub
alsaLib, portaudio, , autoconf, automake, which, libtool, pkgconfig
pulseaudioSupport ? true, libpulseaudio }: , portaudio, alsaLib
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcaudiolib-${version}"; name = "pcaudiolib-${version}";

4
pkgs/tools/misc/brltty/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python3, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: { stdenv, fetchurl, pkgconfig, python3, bluez
, alsaSupport ? stdenv.isLinux, alsaLib ? null
, systemdSupport ? stdenv.isLinux, systemd ? null }:
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert systemdSupport -> systemd != null; assert systemdSupport -> systemd != null;

46
pkgs/top-level/all-packages.nix
View File

@ -413,15 +413,9 @@ in
aefs = callPackage ../tools/filesystems/aefs { }; aefs = callPackage ../tools/filesystems/aefs { };
aegisub = callPackage ../applications/video/aegisub { aegisub = callPackage ../applications/video/aegisub ({
wxGTK = wxGTK30; wxGTK = wxGTK30;
spellcheckSupport = config.aegisub.spellcheckSupport or true; } // (config.aegisub or {}));
automationSupport = config.aegisub.automationSupport or true;
openalSupport = config.aegisub.openalSupport or false;
alsaSupport = config.aegisub.alsaSupport or true;
pulseaudioSupport = config.aegisub.pulseaudioSupport or true;
portaudioSupport = config.aegisub.portaudioSupport or false;
};
aerospike = callPackage ../servers/nosql/aerospike { }; aerospike = callPackage ../servers/nosql/aerospike { };
@ -988,10 +982,8 @@ in
brigand = callPackage ../development/libraries/brigand { }; brigand = callPackage ../development/libraries/brigand { };
brltty = callPackage ../tools/misc/brltty { brltty = callPackage ../tools/misc/brltty { };
alsaSupport = (!stdenv.isDarwin);
systemdSupport = stdenv.isLinux;
};
bro = callPackage ../applications/networking/ids/bro { }; bro = callPackage ../applications/networking/ids/bro { };
broot = callPackage ../tools/misc/broot { }; broot = callPackage ../tools/misc/broot { };
@ -11950,9 +11942,7 @@ in
pangoxsl = callPackage ../development/libraries/pangoxsl { }; pangoxsl = callPackage ../development/libraries/pangoxsl { };
pcaudiolib = callPackage ../development/libraries/pcaudiolib { pcaudiolib = callPackage ../development/libraries/pcaudiolib { };
pulseaudioSupport = config.pulseaudio or true;
};
pcg_c = callPackage ../development/libraries/pcg-c { }; pcg_c = callPackage ../development/libraries/pcg-c { };
@ -16294,7 +16284,6 @@ in
bombono = callPackage ../applications/video/bombono {}; bombono = callPackage ../applications/video/bombono {};
bomi = libsForQt5.callPackage ../applications/video/bomi { bomi = libsForQt5.callPackage ../applications/video/bomi {
pulseSupport = config.pulseaudio or true;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };
@ -16383,18 +16372,7 @@ in
bookworm = callPackage ../applications/office/bookworm { }; bookworm = callPackage ../applications/office/bookworm { };
chromium = callPackage ../applications/networking/browsers/chromium ({ chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
channel = "stable";
pulseSupport = config.pulseaudio or true;
enablePepperFlash = config.chromium.enablePepperFlash or false;
enableWideVine = config.chromium.enableWideVine or false;
} // (if stdenv.isAarch64 then {
stdenv = gcc8Stdenv;
} else {
llvmPackages = llvmPackages_7;
stdenv = llvmPackages_7.stdenv;
})
);
chronos = callPackage ../applications/networking/cluster/chronos { }; chronos = callPackage ../applications/networking/cluster/chronos { };
@ -16434,8 +16412,6 @@ in
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) CoreAudio;
libjack = libjack2; libjack = libjack2;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
pulseaudioSupport = config.pulseaudio or false;
}; };
cmusfm = callPackage ../applications/audio/cmusfm { }; cmusfm = callPackage ../applications/audio/cmusfm { };
@ -16544,9 +16520,7 @@ in
ddgr = callPackage ../applications/misc/ddgr { }; ddgr = callPackage ../applications/misc/ddgr { };
deadbeef = callPackage ../applications/audio/deadbeef { deadbeef = callPackage ../applications/audio/deadbeef { };
pulseSupport = config.pulseaudio or true;
};
deadbeefPlugins = { deadbeefPlugins = {
headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { };
@ -18233,9 +18207,7 @@ in
minitube = libsForQt5.callPackage ../applications/video/minitube { }; minitube = libsForQt5.callPackage ../applications/video/minitube { };
mimic = callPackage ../applications/audio/mimic { mimic = callPackage ../applications/audio/mimic { };
pulseaudioSupport = config.pulseaudio or false;
};
mimms = callPackage ../applications/audio/mimms {}; mimms = callPackage ../applications/audio/mimms {};
@ -18367,7 +18339,6 @@ in
mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };
mplayer = callPackage ../applications/video/mplayer ({ mplayer = callPackage ../applications/video/mplayer ({
pulseSupport = config.pulseaudio or false;
libdvdnav = libdvdnav_4_2_1; libdvdnav = libdvdnav_4_2_1;
} // (config.mplayer or {})); } // (config.mplayer or {}));
@ -19854,7 +19825,6 @@ in
virtualbox = callPackage ../applications/virtualization/virtualbox { virtualbox = callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
inherit (gnome2) libIDL; inherit (gnome2) libIDL;
pulseSupport = config.pulseaudio or true;
}; };
virtualboxHardened = lowPrio (virtualbox.override { virtualboxHardened = lowPrio (virtualbox.override {