Merge staging-next into staging

2021-04-22 00:16:19 +00:00
parent af82393e36 77694c34c6
commit b28a233fef
28 changed files with 319 additions and 36 deletions
@@ -19,6 +19,7 @@
 , libsoup
 , libstartup_notification
 , libXtst
+, libXdamage
 , muffin
 , networkmanager
 , pkg-config
@@ -79,6 +80,7 @@ stdenv.mkDerivation rec {
    libsoup
    libstartup_notification
    libXtst
+    libXdamage
    muffin
    networkmanager
    pkg-config
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
+, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:

 stdenv.mkDerivation rec {
  pname = "marco";
@@ -20,6 +21,8 @@ stdenv.mkDerivation rec {
    libxml2
    libcanberra-gtk3
    libgtop
+    libXdamage
+    libXpresent
    libstartup_notification
    gtk3
    gnome3.zenity