Merge staging into staging-next

2020-04-25 21:53:27 +02:00
parent 89a34c1cce 7280b5eef9
commit 57cfb787ef
35 changed files with 253 additions and 130 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, xfce }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }:

 let
  category = "art";
@@ -19,6 +19,15 @@ stdenv.mkDerivation rec {
    gtk3
  ];

+  buildInputs = [
+    gnome-icon-theme
+    tango-icon-theme
+    hicolor-icon-theme
+    # missing parent icon theme Industrial
+  ];
+
+  dontDropIconThemeCache = true;
+
  passthru.updateScript = xfce.updateScript {
    inherit pname version;
    attrPath = "xfce.${pname}";