Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1504357
2019-02-09 10:15:17 +01:00
parent 6ae1cc2e62 baf6ba553f
commit 7f9e3b8206
197 changed files with 5804 additions and 1612 deletions
@@ -153,9 +153,6 @@ self: super: builtins.intersectAttrs super {
  gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
  gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;

-  # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build
-  taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; }));
-
  # Add necessary reference to gtk3 package
  gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;