Merge staging-next into master

2019-03-01 09:06:20 +01:00
parent 456ff62ff8 fc4a8f63c4
commit 2fcb11a244
682 changed files with 2751 additions and 1768 deletions
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ makeWrapper fcitx cmake isocodes gtk3
-    gnome3.defaultIconTheme ];
+    gnome3.adwaita-icon-theme ];

  preFixup = ''
    wrapProgram $out/bin/fcitx-config-gtk3 \