Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
parent 34a05e29f1 788deaad9d
commit 6b15fdce86
79 changed files with 17575 additions and 547 deletions
@@ -23,6 +23,7 @@
 , qtmultimedia
 , qtquickcontrols2
 , qtx11extras
+, breeze-icons
 , sshfs
 }:

@@ -49,6 +50,8 @@ mkDerivation {
    qtmultimedia
    qtquickcontrols2
    qtx11extras
+    # otherwise buttons are blank on non-kde
+    breeze-icons
  ];

  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];