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
@@ -6,7 +6,7 @@ let pkg = import ./base.nix {
 };
 in callPackage pkg {
  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
-                  gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ];
+                  gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ];
  drvParams = {
    postFixup = ''
      wrapProgram $out/bin/image-analyzer \
@@ -8,7 +8,7 @@ let
  inherit (pythonPackages) python pygobject3;
 in callPackage pkg {
  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
-                  gnome3.defaultIconTheme gdk_pixbuf librsvg ];
+                  gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
  drvParams = {
    postFixup = ''
      wrapProgram $out/bin/gcdemu \