From 20193f85e9c1b1540bca86233a0f3d2ebf7efaa1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:20 +0000 Subject: [PATCH 01/10] mplayer: move defaults to package file --- pkgs/applications/video/mplayer/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index e017e7cc001..c77486a30cf 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg +{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -19,7 +19,7 @@ , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null , jackaudioSupport ? false, libjack2 ? null -, pulseSupport ? false, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9c07edc2c8..ebb7ec105ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18278,7 +18278,6 @@ in mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; mplayer = callPackage ../applications/video/mplayer ({ - pulseSupport = config.pulseaudio or false; libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); From 9361acfff13586840a41e16496c28dc27848671d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:21 +0000 Subject: [PATCH 02/10] aegisub: move defaults to package file --- pkgs/applications/video/aegisub/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index d4208aee62e..a613ad1c584 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ config, stdenv, fetchurl , libX11, wxGTK , libiconv, fontconfig, freetype , libGLU_combined @@ -8,8 +8,8 @@ , spellcheckSupport ? true, hunspell ? null , automationSupport ? true, lua ? null , openalSupport ? false, openal ? null -, alsaSupport ? true, alsaLib ? null -, pulseaudioSupport ? true, libpulseaudio ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , portaudioSupport ? false, portaudio ? null }: assert spellcheckSupport -> (hunspell != null); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebb7ec105ce..b684dcd3c2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -406,15 +406,9 @@ in aefs = callPackage ../tools/filesystems/aefs { }; - aegisub = callPackage ../applications/video/aegisub { + aegisub = callPackage ../applications/video/aegisub ({ wxGTK = wxGTK30; - spellcheckSupport = config.aegisub.spellcheckSupport or true; - 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; - }; + } // (config.aegisub or {})); aerospike = callPackage ../servers/nosql/aerospike { }; From 578408aa16443b3301fdb239145f92cb004ece89 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:22 +0000 Subject: [PATCH 03/10] brltty: move defaults to package file, use ALSA on Linux --- pkgs/tools/misc/brltty/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 6635f293195..99ba8e5e515 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -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 systemdSupport -> systemd != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b684dcd3c2b..e01aeb721f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -967,10 +967,8 @@ in brigand = callPackage ../development/libraries/brigand { }; - brltty = callPackage ../tools/misc/brltty { - alsaSupport = (!stdenv.isDarwin); - systemdSupport = stdenv.isLinux; - }; + brltty = callPackage ../tools/misc/brltty { }; + bro = callPackage ../applications/networking/ids/bro { }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; From d364e682b07447c81bc07a2c5b77cf815abc4738 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:23 +0000 Subject: [PATCH 04/10] 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 { }; From fe7537945909ad051ad1ae532a656f49fd9b4301 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:24 +0000 Subject: [PATCH 05/10] bomi: move defaults to package file --- pkgs/applications/video/bomi/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 671d6794635..bbac1014034 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which +{ config, stdenv, fetchFromGitHub +, fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, libGLU_combined , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet @@ -15,7 +16,7 @@ , libbluray , jackSupport ? false, jack ? null , portaudioSupport ? false, portaudio ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , cddaSupport ? false, libcdda ? null , youtubeSupport ? true, youtube-dl ? null }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a2e5ff86d2..9c38b75a17a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16207,7 +16207,6 @@ in bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { - pulseSupport = config.pulseaudio or true; ffmpeg = ffmpeg_2; }; From f91e811e44ccfdfd8190dd192145baa5670960ac Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:25 +0000 Subject: [PATCH 06/10] chromium: move defaults to package file This one is a bit untrivial. --- .../networking/browsers/chromium/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 13 +------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 88b0a89db4b..c7917e923d4 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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 # package customization @@ -10,12 +11,17 @@ , enablePepperFlash ? false , enableWideVine ? false , cupsSupport ? true -, pulseSupport ? false +, pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" }: -assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv); 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; chromium = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c38b75a17a..59bc2d4ad18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16295,18 +16295,7 @@ in bookworm = callPackage ../applications/office/bookworm { }; - chromium = callPackage ../applications/networking/browsers/chromium ({ - 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; - }) - ); + chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chronos = callPackage ../applications/networking/cluster/chronos { }; From 1eea8a5f4a5837b0cb150742fbf1fb02e6d8d4b4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:26 +0000 Subject: [PATCH 07/10] cmus: move defaults to package file --- pkgs/applications/audio/cmus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index f8c5a4e5acf..5282af654f7 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +{ config, stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig , libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -7,7 +7,7 @@ , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null , ossSupport ? false, alsaOss ? null -, pulseaudioSupport ? false, libpulseaudio ? null +, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null # TODO: add these #, artsSupport diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59bc2d4ad18..e4172105b12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16335,8 +16335,6 @@ in inherit (darwin.apple_sdk.frameworks) CoreAudio; libjack = libjack2; ffmpeg = ffmpeg_2; - - pulseaudioSupport = config.pulseaudio or false; }; cmusfm = callPackage ../applications/audio/cmusfm { }; From 15a1e879a99603acee7c4d8c168f3fd4699703c8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:27 +0000 Subject: [PATCH 08/10] deadbeef: move defaults to package file --- pkgs/applications/audio/deadbeef/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index e2fcc3c4626..0212560cd03 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, jansson +{ config, stdenv, fetchurl, intltool, pkgconfig, jansson # deadbeef can use either gtk2 or gtk3 , gtk2Support ? false, gtk2 ? null , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null @@ -20,7 +20,7 @@ , osdSupport ? true, dbus ? null # output plugins , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null , overloadSupport ? true, zlib ? null diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4172105b12..01af6e5b601 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16443,9 +16443,7 @@ in ddgr = callPackage ../applications/misc/ddgr { }; - deadbeef = callPackage ../applications/audio/deadbeef { - pulseSupport = config.pulseaudio or true; - }; + deadbeef = callPackage ../applications/audio/deadbeef { }; deadbeefPlugins = { headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; From ce14636ae0661ec3050611fbed7e5f16a651fdf6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:28 +0000 Subject: [PATCH 09/10] mimic: move defaults to package file and fix some eol spaces. --- pkgs/applications/audio/mimic/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index a4cd0c944dc..dcaffe3eb9b 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,6 +1,6 @@ -{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +{ config, stdenv, autoreconfHook, fetchFromGitHub, pkgconfig , alsaLib, libtool, icu -, pulseaudioSupport ? true, libpulseaudio }: +, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: stdenv.mkDerivation rec { name = "mimic-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j"; }; - nativeBuildInputs = [ + nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,15 +21,14 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libtool - icu + icu ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; meta = { 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; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.noneucat ]; + maintainers = [ stdenv.lib.maintainers.noneucat ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01af6e5b601..82d214d61a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18118,9 +18118,7 @@ in minitube = libsForQt5.callPackage ../applications/video/minitube { }; - mimic = callPackage ../applications/audio/mimic { - pulseaudioSupport = config.pulseaudio or false; - }; + mimic = callPackage ../applications/audio/mimic { }; mimms = callPackage ../applications/audio/mimms {}; From e29565110886f9857e48376191f9fbd8e43e2a6d Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:31:29 +0000 Subject: [PATCH 10/10] virtualbox: move defaults to package file --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 828db24c325..8304dd15597 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -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 , libpng, glib, lvm2, libXrandr, libXinerama, libopus , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 @@ -7,7 +7,7 @@ , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null , extensionPack ? null, fakeroot ? null -, pulseSupport ? false, libpulseaudio ? null +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , enableHardening ? false , headless ? false , enable32bitGuests ? true diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82d214d61a6..9e8ca93f4f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19726,7 +19726,6 @@ in virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - pulseSupport = config.pulseaudio or true; }; virtualboxHardened = lowPrio (virtualbox.override {