Merge branch 'staging' into fix.icon-theme-inheritance

2020-04-21 10:29:12 -03:00
parent 4d92e1b32d cf1a68360e
commit adcb685ec0
213 changed files with 3962 additions and 1524 deletions
@@ -10,8 +10,7 @@ hicolorIconThemeHook() {
 }

 # I think this is meant to be a runtime dep
-addEnvHooks "${hostOffset:?}" hicolorIconThemeHook
-
+addEnvHooks "${targetOffset:?}" hicolorIconThemeHook

 # Make symbolic links of parent icon themes that are inherited in the
 # icon themes installed by the package.
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
    license     = licenses.gpl3;
    maintainers = with maintainers; [ simonvandel romildo ];
    platforms   = platforms.linux;
+    broken = true; # since libsass 3.6.3
  };
 }
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
    license = with licenses; [ cc-by-sa-40 gpl3 ];
    platforms = platforms.linux;
    maintainers = [ maintainers.jD91mZM2 ];
+    broken = true; # since libsass 3.6.3
  };
 }